Mercurial > hg > mercurial-crew-with-dirclash
diff 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 |
line wrap: on
line diff
new file mode 100755 --- /dev/null +++ b/tests/test-pull-update @@ -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