Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 2856:18cf5349a361

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some bugs introduced during the manifest refactoring
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 12 Aug 2006 08:53:23 -0300
parents e3fb4223e750
children 345bac2bc4ec
comparison
equal deleted inserted replaced
2855:a3c73c9679d2 2856:18cf5349a361
499 changed.append(f) 499 changed.append(f)
500 if update_dirstate: 500 if update_dirstate:
501 self.dirstate.update([f], "n") 501 self.dirstate.update([f], "n")
502 except IOError: 502 except IOError:
503 try: 503 try:
504 del m1[f]
505 del m1[f] 504 del m1[f]
506 if update_dirstate: 505 if update_dirstate:
507 self.dirstate.forget([f]) 506 self.dirstate.forget([f])
508 except: 507 except:
509 # deleted from p2? 508 # deleted from p2?