Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 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
comparison
equal deleted inserted replaced
230:00ea3613f82c 231:15e7c6cee929
208 pos += l 208 pos += l
209 209
210 def update(self, files, state): 210 def update(self, files, state):
211 ''' current states: 211 ''' current states:
212 n normal 212 n normal
213 m needs merging
213 i invalid 214 i invalid
214 r marked for removal 215 r marked for removal
215 a marked for addition''' 216 a marked for addition'''
216 217
217 if not files: return 218 if not files: return
539 elif c[0] == 'i': 540 elif c[0] == 'i':
540 if fn not in mf: 541 if fn not in mf:
541 added.append(fn) 542 added.append(fn)
542 elif fcmp(fn): 543 elif fcmp(fn):
543 changed.append(fn) 544 changed.append(fn)
545 elif c[0] == 'm':
546 changed.append(fn)
544 elif c[0] == 'a': 547 elif c[0] == 'a':
545 added.append(fn) 548 added.append(fn)
546 elif c[0] == 'r': 549 elif c[0] == 'r':
547 unknown.append(fn) 550 unknown.append(fn)
548 elif c[2] != s.st_size: 551 elif c[2] != s.st_size: