Submitter | Durham Goode |
---|---|
Date | May 31, 2013, 5:19 p.m. |
Message ID | <d6d28e9ca7f60bf791f0.1370020783@dev350.prn1.facebook.com> |
Download | mbox | patch |
Permalink | /patch/1685/ |
State | Superseded, archived |
Commit | 9bfa86746c9c1f6ab51deb8f174ffc482417d09f |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -452,11 +452,11 @@ if fcl.parents(): fca = fcl.p1() else: - fca = repo.filectx(f, fileid=nullrev) + fca = repo.filectx(f, fileid=nullid) else: fca = fcl.ancestor(fco, actx) if not fca: - fca = repo.filectx(f, fileid=nullrev) + fca = repo.filectx(f, fileid=nullid) ms.add(fcl, fco, fca, fd) if f != fd and move: moves.append(f)