Mercurial > public > mercurial-scm > hg
diff mercurial/localrepo.py @ 6549:2af1b9de62b3
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 14 Apr 2008 23:04:34 +0200 |
| parents | bd6bf5798f39 93e140dbcd44 |
| children | 4927cf61bdc1 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Mon Apr 14 14:34:38 2008 +0200 +++ b/mercurial/localrepo.py Mon Apr 14 23:04:34 2008 +0200 @@ -712,17 +712,17 @@ # meta["copy"] = cp if not manifest2: # not a branch merge - meta["copyrev"] = hex(manifest1.get(cp, nullid)) + meta["copyrev"] = hex(manifest1[cp]) fp2 = nullid elif fp2 != nullid: # copied on remote side - meta["copyrev"] = hex(manifest1.get(cp, nullid)) + meta["copyrev"] = hex(manifest1[cp]) elif fp1 != nullid: # copied on local side, reversed - meta["copyrev"] = hex(manifest2.get(cp)) + meta["copyrev"] = hex(manifest2[cp]) fp2 = fp1 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)) + meta["copyrev"] = hex(manifest1[cp]) self.ui.debug(_(" %s: copy %s:%s\n") % (fn, cp, meta["copyrev"])) fp1 = nullid