Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't mark files with 'm'erge unless we're actually merging branches
authormpm@selenic.com
Fri, 22 Jul 2005 19:23:00 -0500
changeset 764 eea96285cbf9
parent 763 84f9ac74cc30
child 765 1e31d97c3d70
Don't mark files with 'm'erge unless we're actually merging branches For 3-way merges, we were marking files as 'm', which should only be used for branch merges. This was causing files to show up in 'hg status' that aren't actually modified.
mercurial/commands.py file | annotate | diff | comparison | revisions
mercurial/hg.py file | annotate | diff | comparison | revisions 
--- a/mercurial/hg.py	Fri Jul 22 16:27:30 2005 +0100
+++ b/mercurial/hg.py	Fri Jul 22 19:23:00 2005 -0500
@@ -1507,7 +1507,7 @@
             self.merge3(f, m, o)
             util.set_exec(self.wjoin(f), flag)
             if moddirstate:
-                self.dirstate.update([f], 'm')
+                self.dirstate.update([f], mode)
 
         remove.sort()
         for f in remove:
mercurial