Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-pull-update @ 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 #!/bin/sh | |
2 # | |
3 | |
4 hg init t | |
5 cd t | |
6 echo 1 > foo | |
7 hg ci -Am m | |
8 | |
9 cd .. | |
10 hg clone t tt | |
11 cd tt | |
12 echo 1.1 > foo | |
13 hg ci -Am m | |
14 | |
15 cd ../t | |
16 echo 1.2 > foo | |
17 hg ci -Am m | |
18 echo % should fail | |
19 hg pull -u ../tt | |
20 | |
21 cd ../tt | |
22 echo % should fail | |
23 hg pull -u ../t | |
24 HGMERGE=true hg merge | |
25 hg ci -mm | |
26 | |
27 cd ../t | |
28 echo % should work | |
29 hg pull -u ../tt |