Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 4536:720ae5085ee3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: fix bug where dirstate for removed file is confused This fixes issue586
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Jun 2007 21:16:58 -0500
parents b51a8138292a
children 3f4555babe74
comparison
equal deleted inserted replaced
4535:121999244123 4536:720ae5085ee3
808 808
809 for f in remove: 809 for f in remove:
810 if f in m1: 810 if f in m1:
811 del m1[f] 811 del m1[f]
812 removed.append(f) 812 removed.append(f)
813 elif f in m2:
814 removed.append(f)
813 mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0], (new, removed)) 815 mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0], (new, removed))
814 816
815 # add changeset 817 # add changeset
816 new = new.keys() 818 new = new.keys()
817 new.sort() 819 new.sort()