martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY I'm about to add more code in the block I'm modifying here. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12415 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py --- a/mercurial/cmdutil.py +++ b/mercurial/cmdutil.py @@ -3749,10 +3749,12 @@ for f in actions[b'add'][0]: # Don't checkout modified files, they are already created by the diff - if f not in newlyaddedandmodifiedfiles: - prntstatusmsg(b'add', f) - checkout(f) - repo.dirstate.set_tracked(f) + if f in newlyaddedandmodifiedfiles: + continue + + prntstatusmsg(b'add', f) + checkout(f) + repo.dirstate.set_tracked(f) for f in actions[b'undelete'][0]: if interactive: To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
