Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 4819 9797124581c9
parent 4748 8808ea7da86b
child 4884 931f901ab811 
--- a/mercurial/merge.py	Thu Jul 05 13:34:18 2007 -0500
+++ b/mercurial/merge.py	Thu Jul 05 16:01:07 2007 -0500
@@ -478,6 +478,9 @@
                     repo.dirstate.forget([f])
         elif m == "d": # directory rename
             f2, fd, flag = a[2:]
+            if not f2 and f not in repo.dirstate:
+                # untracked file moved
+                continue
             if branchmerge:
                 repo.dirstate.update([fd], 'a')
                 if f:
Mercurial