Skip to content

Conversation

@pmrowla
Copy link
Contributor

@pmrowla pmrowla commented Aug 3, 2020

Thank you for the contribution - we'll try to review it as soon as possible. 🙏

Should fix #4289.

  • No longer use git reset --hard when doing checkout.
  • Changes from the experiment commit are preferred over workspace changes, but all other unrelated and unstaged/uncommitted workspace changes will now be preserved after dvc experiments checkout

@pmrowla pmrowla added the A: experiments Related to dvc exp label Aug 3, 2020
@pmrowla pmrowla self-assigned this Aug 3, 2020
@pmrowla pmrowla requested a review from efiop August 3, 2020 07:36
Comment on lines +91 to +97
@contextmanager
def chdir(self):
cwd = os.getcwd()
os.chdir(self.exp_dvc.root_dir)
yield self.exp_dvc.root_dir
os.chdir(cwd)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't see it being used anywhere

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@codecov
Copy link

codecov bot commented Aug 3, 2020

Codecov Report

Merging #4320 into master will increase coverage by 0.03%.
The diff coverage is 94.04%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4320      +/-   ##
==========================================
+ Coverage   91.20%   91.24%   +0.03%     
==========================================
  Files         176      177       +1     
  Lines       12104    12182      +78     
==========================================
+ Hits        11039    11115      +76     
- Misses       1065     1067       +2     
Impacted Files Coverage Δ
dvc/cli.py 94.54% <ø> (ø)
dvc/ignore.py 95.13% <89.36%> (+0.03%) ⬆️
dvc/command/check_ignore.py 100.00% <100.00%> (ø)
dvc/pathspec_math.py 94.54% <100.00%> (+0.20%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b823ce4...31dd337. Read the comment docs.

@efiop efiop merged commit 73750df into treeverse:master Aug 4, 2020
@pmrowla pmrowla deleted the experiments-checkout branch August 4, 2020 02:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A: experiments Related to dvc exp

Projects

None yet

Development

Successfully merging this pull request may close these issues.

experiments: core.experiments config setting overridden in certain situations

2 participants