Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 4748:8808ea7da86b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Jul 2007 13:34:18 -0500
parents dc5920ea12f8
children 9797124581c9
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Jul 04 09:20:56 2007 +0200
+++ b/mercurial/merge.py	Thu Jul 05 13:34:18 2007 -0500
@@ -523,7 +523,7 @@
         raise util.Abort(_("outstanding uncommitted merges"))
     if pa == p1 or pa == p2: # is there a linear path from p1 to p2?
         if branchmerge:
-            if p1.branch() != p2.branch():
+            if p1.branch() != p2.branch() and pa != p2:
                 fastforward = True
             else:
                 raise util.Abort(_("there is nothing to merge, just use "