##// END OF EJS Templates
Update on pull -u when heads were closed (fixes issue666)....
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.

File last commit:

r3199:096f1c73 default
r5080:73fdc8bd default
Show More
test-diff-subdir
24 lines | 291 B | text/plain | TextLexer
#!/bin/sh
hg init
mkdir alpha
touch alpha/one
mkdir beta
touch beta/two
hg add alpha/one beta/two
hg ci -m "start" -d "1000000 0"
echo 1 > alpha/one
echo 2 > beta/two
echo EVERYTHING
hg diff --nodates
echo BETA ONLY
hg diff --nodates beta
echo INSIDE BETA
cd beta
hg diff --nodates .