Mercurial > hg

changeset 11417:6f1d1ed3e19a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: improve merge with ancestor message
author Matt Mackall <mpm@selenic.com>
date Sun, 20 Jun 2010 14:21:56 -0500
parents caf10970950e
children 67bb9d78f05e b4467a7d5c75
files mercurial/merge.py tests/test-issue619.out
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Jun 16 00:22:10 2010 +0200
+++ b/mercurial/merge.py	Sun Jun 20 14:21:56 2010 -0500
@@ -467,7 +467,8 @@
             raise util.Abort(_("outstanding uncommitted merges"))
         if branchmerge:
             if pa == p2:
-                raise util.Abort(_("can't merge with ancestor"))
+                raise util.Abort(_("merging with a working directory ancestor"
+                                   " has no effect"))
             elif pa == p1:
                 if p1.branch() != p2.branch():
                     fastforward = True
--- a/tests/test-issue619.out	Wed Jun 16 00:22:10 2010 +0200
+++ b/tests/test-issue619.out	Sun Jun 20 14:21:56 2010 -0500
@@ -6,5 +6,5 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 bogus fast-forward should fail
-abort: can't merge with ancestor
+abort: merging with a working directory ancestor has no effect
 done