# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1186425075 -7200
# Node ID 90be02035993e6f35a0f6f9ddbede55df0903b4e
# Parent  a2c11f49e989cac7498da49e43a4927dec418f66# Parent  73fdc8bd3ed81be5b4764aafd4ad96c307035695
merge with crew-stable

diff -r a2c11f49e989 -r 90be02035993 mercurial/commands.py
--- a/mercurial/commands.py	Mon Aug 06 10:57:51 2007 +0200
+++ b/mercurial/commands.py	Mon Aug 06 20:31:15 2007 +0200
@@ -2012,7 +2012,7 @@
     if modheads == 0:
         return
     if optupdate:
-        if modheads == 1:
+        if modheads <= 1:
             return hg.update(repo, None)
         else:
             ui.status(_("not updating, since new heads added\n"))
diff -r a2c11f49e989 -r 90be02035993 tests/run-tests.py
--- a/tests/run-tests.py	Mon Aug 06 10:57:51 2007 +0200
+++ b/tests/run-tests.py	Mon Aug 06 20:31:15 2007 +0200
@@ -227,6 +227,8 @@
             ret = proc.wait()
             if ret == 0:
                 ret = signal.SIGTERM << 8
+            output += ("\n### Abort: timeout after %d seconds.\n"
+                       % options.timeout)
     return ret, splitnewlines(output)
 
 def run_one(test):
diff -r a2c11f49e989 -r 90be02035993 tests/test-pull-update
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-pull-update	Mon Aug 06 20:31:15 2007 +0200
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+
+hg init t
+cd t
+echo 1 > foo
+hg ci -Am m
+
+cd ..
+hg clone t tt
+cd tt
+echo 1.1 > foo
+hg ci -Am m
+
+cd ../t
+echo 1.2 > foo
+hg ci -Am m
+echo % should fail
+hg pull -u ../tt
+
+cd ../tt
+echo % should fail
+hg pull -u ../t
+HGMERGE=true hg merge
+hg ci -mm
+
+cd ../t
+echo % should work
+hg pull -u ../tt
diff -r a2c11f49e989 -r 90be02035993 tests/test-pull-update.out
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-pull-update.out	Mon Aug 06 20:31:15 2007 +0200
@@ -0,0 +1,31 @@
+adding foo
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+% should fail
+pulling from ../tt
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files (+1 heads)
+not updating, since new heads added
+(run 'hg heads' to see heads, 'hg merge' to merge)
+% should fail
+pulling from ../t
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files (+1 heads)
+not updating, since new heads added
+(run 'hg heads' to see heads, 'hg merge' to merge)
+merging foo
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+% should work
+pulling from ../tt
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files (-1 heads)
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved