Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 1234:9ee8428d84a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert unrelated changes in previous commit
author mpm@selenic.com
date Tue, 13 Sep 2005 14:22:48 -0500
parents 5381b0d88e9e
children 67a28636ea64
comparison
equal deleted inserted replaced
1233:5381b0d88e9e 1234:9ee8428d84a1
1106 remove.append(f) 1106 remove.append(f)
1107 else: 1107 else:
1108 self.ui.debug("other deleted %s\n" % f) 1108 self.ui.debug("other deleted %s\n" % f)
1109 remove.append(f) # other deleted it 1109 remove.append(f) # other deleted it
1110 else: 1110 else:
1111 # file is not in ancestor or target 1111 if n == m1.get(f, nullid): # same as parent
1112 if n == m1.get(f, nullid) or force: # same as parent 1112 if p2 == pa: # going backwards?
1113 self.ui.debug("remote deleted %s\n" % f) 1113 self.ui.debug("remote deleted %s\n" % f)
1114 remove.append(f) 1114 remove.append(f)
1115 else:
1116 self.ui.debug("local created %s, keeping\n" % f)
1115 else: 1117 else:
1116 self.ui.debug("working dir created %s, keeping\n" % f) 1118 self.ui.debug("working dir created %s, keeping\n" % f)
1117 1119
1118 for f, n in m2.iteritems(): 1120 for f, n in m2.iteritems():
1119 if choose and not choose(f): continue 1121 if choose and not choose(f): continue