Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 11178:21a7ae13208f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: avoid to break the dirstate copy status on moved files In the case a file is locally tracked as copied in dirstate, and that a merge affects this file, this file should not be marked as modified in dirstate, as this will break the current copy state. Note: only affect working directory merge, not branch merge.
author Gilles Moris <gilles.moris@free.fr>
date Tue, 04 May 2010 09:57:16 +0200
parents 502474839293
children 6f1d1ed3e19a
line wrap: on
line diff
--- a/mercurial/merge.py	Sat May 15 17:48:49 2010 -0500
+++ b/mercurial/merge.py	Tue May 04 09:57:16 2010 +0200
@@ -386,7 +386,8 @@
                 # of that file some time in the past. Thus our
                 # merge will appear as a normal local file
                 # modification.
-                repo.dirstate.normallookup(fd)
+                if f2 == fd: # file not locally copied/moved
+                    repo.dirstate.normallookup(fd)
                 if move:
                     repo.dirstate.forget(f)
         elif m == "d": # directory rename