# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1162296169 -3600
# Node ID fffc8a733bf9fa237bb757aa9dfabd33bf4bd9ed
# Parent  41989e55fa375de4376e7e64b17e38312e8ec140
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140

diff -r 41989e55fa37 -r fffc8a733bf9 mercurial/merge.py
--- a/mercurial/merge.py	Sun Oct 29 13:08:10 2006 +0100
+++ b/mercurial/merge.py	Tue Oct 31 13:02:49 2006 +0100
@@ -384,13 +384,9 @@
         if branchmerge:
             raise util.Abort(_("there is nothing to merge, just use "
                                "'hg update' or look at 'hg heads'"))
-    elif not branchmerge:
-        if not overwrite:
-            if wc.files():
-                raise util.Abort(_("outstanding uncommited changes, use "
-                                   "'hg update -C' to lose changes"))
-            else:
-                overwrite = True
+    elif not (overwrite or branchmerge):
+        raise util.Abort(_("update spans branches, use 'hg merge' "
+                           "or 'hg update -C' to lose changes"))
     if branchmerge and not forcemerge:
         if wc.modified() or wc.added() or wc.removed():
             raise util.Abort(_("outstanding uncommitted changes"))
diff -r 41989e55fa37 -r fffc8a733bf9 tests/test-merge5
--- a/tests/test-merge5	Sun Oct 29 13:08:10 2006 +0100
+++ b/tests/test-merge5	Tue Oct 31 13:02:49 2006 +0100
@@ -12,13 +12,9 @@
 hg update 0
 rm b
 hg commit -A -m"comment #2" -d "1000000 0"
-
-echo This is file a > a
 # in theory, we shouldn't need the "-y" below, but it prevents
 # this test from hanging when "hg update" erroneously prompts the
 # user for "keep or delete"
-hg update -y 1 # should fail (unclean repo)
-hg revert a
 hg update -y 1
 
 exit 0
diff -r 41989e55fa37 -r fffc8a733bf9 tests/test-merge5.out
--- a/tests/test-merge5.out	Sun Oct 29 13:08:10 2006 +0100
+++ b/tests/test-merge5.out	Tue Oct 31 13:02:49 2006 +0100
@@ -1,4 +1,3 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 removing b
-abort: outstanding uncommited changes, use 'hg update -C' to lose changes
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
diff -r 41989e55fa37 -r fffc8a733bf9 tests/test-up-local-change.out
--- a/tests/test-up-local-change.out	Sun Oct 29 13:08:10 2006 +0100
+++ b/tests/test-up-local-change.out	Tue Oct 31 13:02:49 2006 +0100
@@ -93,7 +93,7 @@
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
-abort: outstanding uncommited changes, use 'hg update -C' to lose changes
+abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
 failed
 abort: outstanding uncommitted changes
 failed