Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 1233:5381b0d88e9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix abort message for clone
author mpm@selenic.com
date Tue, 13 Sep 2005 14:18:18 -0500
parents 78ceaf83f28f
children 9ee8428d84a1
comparison
equal deleted inserted replaced
1232:eb3cc5e2eb89 1233:5381b0d88e9e
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 if n == m1.get(f, nullid): # same as parent 1111 # file is not in ancestor or target
1112 if p2 == pa: # going backwards? 1112 if n == m1.get(f, nullid) or force: # same as parent
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)
1117 else: 1115 else:
1118 self.ui.debug("working dir created %s, keeping\n" % f) 1116 self.ui.debug("working dir created %s, keeping\n" % f)
1119 1117
1120 for f, n in m2.iteritems(): 1118 for f, n in m2.iteritems():
1121 if choose and not choose(f): continue 1119 if choose and not choose(f): continue