##// 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:

r4597:ec431334 merge default
r5080:73fdc8bd default
Show More
test-patchbomb
20 lines | 473 B | text/plain | TextLexer
Bryan O'Sullivan
add test for patchbomb extension.
r4420 #!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "patchbomb=" >> $HGRCPATH
hg init
echo a > a
hg commit -Ama -d '1 0'
Thomas Arendsen Hein
Correct tests/test-patchbomb* files:...
r4567 hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar tip | \
sed -e 's/\(Message-Id:.*@\).*/\1/'
Bryan O'Sullivan
add test for patchbomb extension.
r4420
echo b > b
hg commit -Amb -d '2 0'
Thomas Arendsen Hein
Correct tests/test-patchbomb* files:...
r4567 hg email --date '1970-1-1 0:2' -n -f quux -t foo -c bar -s test 0:tip | \
Giorgos Keramidas
test-patchbomb: sed -e may not work with extended regexps...
r4568 sed -e 's/\(Message-Id:.*@\).*/\1/' | \
sed -e 's/\(In-Reply-To:.*@\).*/\1/'
Bryan O'Sullivan
Don't validate email config if we're not sending email.
r4565
Thomas Arendsen Hein
Correct tests/test-patchbomb* files:...
r4567 hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip