Mercurial > hg > pyhgsh

changeset 764:eea96285cbf9

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 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.
author mpm@selenic.com
date Fri, 22 Jul 2005 19:23:00 -0500
parents 84f9ac74cc30
children 1e31d97c3d70
files mercurial/commands.py mercurial/hg.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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: