Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/localrepo.py @ 5244:dee573ba79f1
correctly record file-level history when the local side renames a directory
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Mon, 27 Aug 2007 14:21:04 -0300 |
| parents | 8050f13772f6 |
| children | 0d28d4e5fe1f ef65d6ec114e |
line wrap: on
line diff
--- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -612,7 +612,9 @@ class localrepository(repo.repository): elif fp1 != nullid: # copied on local side, reversed meta["copyrev"] = hex(manifest2.get(cp)) fp2 = fp1 - else: # directory rename + elif cp in manifest2: # directory rename on local side + meta["copyrev"] = hex(manifest2[cp]) + else: # directory rename on remote side meta["copyrev"] = hex(manifest1.get(cp, nullid)) self.ui.debug(_(" %s: copy %s:%s\n") % (fn, cp, meta["copyrev"]))