Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 650:2c934c7b79dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug in reverting deleted files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix bug in reverting deleted files Force updates and reverts wouldn't restore deleted files in the working dir. This should fix that. manifest hash: e14809399bbc63da42e8c8f694cc8acf31e537f7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzjOJywK+sNU5EO8RAqVLAKCC1BF6JhNiO6n4LJGvy9RBTgOelwCdF9Tr sADRnovYt9xSnUGmd1Om9JQ= =SdcP -----END PGP SIGNATURE-----
author Matt Mackall <mpm@selenic.com>
date Fri, 08 Jul 2005 00:04:25 -0800
parents a7e267222864
children a54a1c101a9a
comparison
equal deleted inserted replaced
649:a7e267222864 650:2c934c7b79dc
1261 linear_path = (pa == p1 or pa == p2) 1261 linear_path = (pa == p1 or pa == p2)
1262 1262
1263 # resolve the manifest to determine which files 1263 # resolve the manifest to determine which files
1264 # we care about merging 1264 # we care about merging
1265 self.ui.note("resolving manifests\n") 1265 self.ui.note("resolving manifests\n")
1266 self.ui.debug(" force %s allow %s moddirstate %s linear %s\n" %
1267 (force, allow, moddirstate, linear_path))
1266 self.ui.debug(" ancestor %s local %s remote %s\n" % 1268 self.ui.debug(" ancestor %s local %s remote %s\n" %
1267 (short(man), short(m1n), short(m2n))) 1269 (short(man), short(m1n), short(m2n)))
1268 1270
1269 merge = {} 1271 merge = {}
1270 get = {} 1272 get = {}
1378 elif f not in ma: 1380 elif f not in ma:
1379 self.ui.debug("remote created %s\n" % f) 1381 self.ui.debug("remote created %s\n" % f)
1380 get[f] = n 1382 get[f] = n
1381 else: 1383 else:
1382 self.ui.debug("local deleted %s\n" % f) 1384 self.ui.debug("local deleted %s\n" % f)
1385 if force:
1386 get[f] = n
1383 1387
1384 del mw, m1, m2, ma 1388 del mw, m1, m2, ma
1385 1389
1386 if force: 1390 if force:
1387 for f in merge: 1391 for f in merge: