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

r4180:f80cf8b7 default
r5080:73fdc8bd default
Show More
test-diffdir
20 lines | 205 B | text/plain | TextLexer
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
r536 #!/bin/sh
hg init
touch a
hg add a
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg ci -m "a" -d "1000000 0"
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
r536
echo 123 > b
hg add b
Stephen Darnell
Add -D/--nodates options to hg diff/export that removes dates from diff headers...
r3199 hg diff --nodates
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
r536
Stephen Darnell
Add -D/--nodates options to hg diff/export that removes dates from diff headers...
r3199 hg diff --nodates -r tip
Thomas Arendsen Hein
Fix diff against an empty file (issue124) and add a test for this.
r1723
echo foo > a
Stephen Darnell
Add -D/--nodates options to hg diff/export that removes dates from diff headers...
r3199 hg diff --nodates
Alexis S. L. Carvalho
fix hg diff -r ''
r3825
hg diff -r ""
hg diff -r tip -r ""
true