Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 383:4862a134e2c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg merge: fix time asymmetry bug with deleting files on update to past -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg merge: fix time asymmetry bug with deleting files on update to past manifest hash: 41feb7bf9b56e071a538a0918224898acb2bd31c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsm6XywK+sNU5EO8RAncbAKCwn/W4cr6civp4Zt79JFH6um0/lQCdFCh8 F7ZOQ+S/PL3HL4iE6avOBDc= =kHPm -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 16 Jun 2005 22:32:55 -0800
parents e5d769afd3ef
children e9e1efd5291c
comparison
equal deleted inserted replaced
382:37249c522770 383:4862a134e2c2
1074 else: 1074 else:
1075 self.ui.debug("other deleted %s\n" % f) 1075 self.ui.debug("other deleted %s\n" % f)
1076 remove.append(f) # other deleted it 1076 remove.append(f) # other deleted it
1077 else: 1077 else:
1078 if n == m1.get(f, nullid): # same as parent 1078 if n == m1.get(f, nullid): # same as parent
1079 self.ui.debug("local created %s, keeping\n" % f) 1079 if p2 == pa: # going backwards?
1080 self.ui.debug("remote deleted %s\n" % f)
1081 remove.append(f)
1082 else:
1083 self.ui.debug("local created %s, keeping\n" % f)
1080 else: 1084 else:
1081 self.ui.debug("working dir created %s, keeping\n" % f) 1085 self.ui.debug("working dir created %s, keeping\n" % f)
1082 1086
1083 for f, n in m2.iteritems(): 1087 for f, n in m2.iteritems():
1084 if f[0] == "/": continue 1088 if f[0] == "/": continue