Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-pull-update.out @ 5097: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 |
comparison
equal
deleted
inserted
replaced
5096:04c1474ccddd | 5097:73fdc8bd3ed8 |
---|---|
1 adding foo | |
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
3 % should fail | |
4 pulling from ../tt | |
5 searching for changes | |
6 adding changesets | |
7 adding manifests | |
8 adding file changes | |
9 added 1 changesets with 1 changes to 1 files (+1 heads) | |
10 not updating, since new heads added | |
11 (run 'hg heads' to see heads, 'hg merge' to merge) | |
12 % should fail | |
13 pulling from ../t | |
14 searching for changes | |
15 adding changesets | |
16 adding manifests | |
17 adding file changes | |
18 added 1 changesets with 1 changes to 1 files (+1 heads) | |
19 not updating, since new heads added | |
20 (run 'hg heads' to see heads, 'hg merge' to merge) | |
21 merging foo | |
22 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
23 (branch merge, don't forget to commit) | |
24 % should work | |
25 pulling from ../tt | |
26 searching for changes | |
27 adding changesets | |
28 adding manifests | |
29 adding file changes | |
30 added 1 changesets with 1 changes to 1 files (-1 heads) | |
31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |