Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 6275:fda369b5779c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: use copy smarts from copies.py
author Matt Mackall <mpm@selenic.com>
date Sat, 15 Mar 2008 10:02:31 -0500
parents f3f383efbeae
children 6aa4a3fa4e60
line wrap: on
line diff
--- a/mercurial/merge.py	Sat Mar 15 10:02:31 2008 -0500
+++ b/mercurial/merge.py	Sat Mar 15 10:02:31 2008 -0500
@@ -100,7 +100,7 @@
         repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
         action.append((f, m) + args)
 
-    if not (backwards or overwrite):
+    if pa and not (backwards or overwrite):
         copy, diverge = copies.copies(repo, p1, p2, pa)
         copied = dict.fromkeys(copy.values())
         for of, fl in diverge.items():