Mercurial > hg

changeset 231:15e7c6cee929

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add 'm' state to dirstates -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add 'm' state to dirstates This state indicates that a file has been merged with resolve and must be in the next commit. manifest hash: dc90629b73056b671f7be3de0283039c96c9ca0f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMQSywK+sNU5EO8RAuxHAKCHckvSiLwegl5hbF5x5EeQg0MA2gCcCYD+ 78Ol99Y9nk5ZA2bbYgM+AQw= =vMOg -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 03 Jun 2005 12:56:50 -0800
parents 00ea3613f82c
children fc4a6e5b5812
files mercurial/hg.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Fri Jun 03 12:55:56 2005 -0800
+++ b/mercurial/hg.py	Fri Jun 03 12:56:50 2005 -0800
@@ -210,6 +210,7 @@
     def update(self, files, state):
         ''' current states:
         n  normal
+        m  needs merging
         i  invalid
         r  marked for removal
         a  marked for addition'''
@@ -541,6 +542,8 @@
                             added.append(fn)
                         elif fcmp(fn):
                             changed.append(fn)
+                    elif c[0] == 'm':
+                        changed.append(fn)
                     elif c[0] == 'a':
                         added.append(fn)
                     elif c[0] == 'r':