Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 344:db419f14df4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix yet another resolve corner case -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix yet another resolve corner case manifest hash: a194321b5cd718a3c31f327c5145a4ebd8dd4ef4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+IvywK+sNU5EO8RAt49AJwLBBq7AZfo1WqcwZvzSVENvJGLmgCePumQ 0/9RwjL/PorsvFJi+CiFYyY= =S6HA -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 15 Jun 2005 00:09:19 -0800
parents d7df759d0e97
children f69a5d2d4fe1
comparison
equal deleted inserted replaced
343:d7df759d0e97 344:db419f14df4b
1022 else: 1022 else:
1023 self.ui.debug("other deleted %s\n" % f) 1023 self.ui.debug("other deleted %s\n" % f)
1024 remove.append(f) # other deleted it 1024 remove.append(f) # other deleted it
1025 else: 1025 else:
1026 if n == m1.get(f, nullid): # same as parent 1026 if n == m1.get(f, nullid): # same as parent
1027 self.ui.debug("remote deleted %s\n" % f) 1027 self.ui.debug("local created %s, keeping\n" % f)
1028 remove.append(f)
1029 else: 1028 else:
1030 self.ui.debug("working dir created %s, keeping\n" % f) 1029 self.ui.debug("working dir created %s, keeping\n" % f)
1031 1030
1032 for f, n in m2.iteritems(): 1031 for f, n in m2.iteritems():
1033 if f[0] == "/": continue 1032 if f[0] == "/": continue