Mercurial > hg
diff tests/test-pull-update.out @ 5080:73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Patch written by Benoit Boissinot.
This should probably be improved in the future to handle long-living
branches, as joining two "other" heads will switch to that new head.
But this is not a new problem, as adding to the "other" head would have
switched to that new head, too.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 06 Aug 2007 20:25:50 +0200 |
parents | |
children | 0750f11152fe |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-pull-update.out Mon Aug 06 20:25:50 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