Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 23387:3eb99f8e9a62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove obsolete check for untracked files in 'dm' action Since 0776a6cababe (merge: don't use unknown(), 2012-02-09), untracked files are no longer included in the manifest diff, so there is no need to check exclude them when renaming files for directory moves with the 'dm' action.
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 24 Nov 2014 09:50:27 -0800
parents 8229f32d2b79
children d9ebb475eede
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Nov 23 23:10:34 2014 -0800
+++ b/mercurial/merge.py	Mon Nov 24 09:50:27 2014 -0800
@@ -896,9 +896,6 @@
     # directory rename, move local
     for f, args, msg in actions['dm']:
         f0, flag = args
-        if f0 not in repo.dirstate:
-            # untracked file moved
-            continue
         if branchmerge:
             repo.dirstate.add(f)
             repo.dirstate.remove(f0)