Mercurial Mercurial > mercurial / 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/hg.py
changeset 764 eea96285cbf9
parent 753 8760d0c83b9b
child 765 1e31d97c3d70 
--- 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