Mercurial > hg-stable
changeset 5125:90be02035993
merge with crew-stable
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 06 Aug 2007 20:31:15 +0200 |
| parents | a2c11f49e989 (current diff) 73fdc8bd3ed8 (diff) |
| children | 117dab48ca99 c9126c24e098 |
| files | mercurial/commands.py tests/test-pull-update |
| diffstat | 4 files changed, 63 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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"))
--- 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):
--- /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
--- /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