Mercurial > public > mercurial-scm > hg-stable

diff mercurial/patch.py @ 15774:0bd17a4bed88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: split the copies api for "normal" and merge cases (API)
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Jan 2012 15:48:02 -0600
parents 97fc5eec3f43
children 089ee59a8658
line wrap: on
line diff
--- a/mercurial/patch.py	Tue Jan 03 17:13:03 2012 -0600
+++ b/mercurial/patch.py	Wed Jan 04 15:48:02 2012 -0600
@@ -1600,7 +1600,7 @@
 
     copy = {}
     if opts.git or opts.upgrade:
-        copy = copies.copies(repo, ctx1, ctx2, repo[nullid])[0]
+        copy = copies.pathcopies(ctx1, ctx2)
 
     difffn = lambda opts, losedata: trydiff(repo, revs, ctx1, ctx2,
                  modified, added, removed, copy, getfilectx, opts, losedata, prefix)