Mercurial > hg
view tests/test-branches @ 9827:4fe9ca519637
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)
Previous code was computing hunks then checking if these hunks could be ignored
when taking whitespace/blank-lines options in accounts. This approach is simple
but fails with hunks containing both whitespace and non-whitespace changes, the
whole hunk is emitted while it can be mostly made of whitespace. The new
version normalize the whitespaces before hunk generation, and test for
blank-lines afterwards.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 11 Nov 2009 18:31:42 +0100 |
parents | 7e0b31dfc66f |
children | 58e040c51231 |
line wrap: on
line source
#!/bin/sh hg init a cd a echo 'root' >root hg add root hg commit -d '0 0' -m "Adding root node" echo 'a' >a hg add a hg branch a hg commit -d '1 0' -m "Adding a branch" hg branch q echo 'aa' >a hg branch -C hg commit -d '2 0' -m "Adding to a branch" hg update -C 0 echo 'b' >b hg add b hg branch b hg commit -d '2 0' -m "Adding b branch" echo 'bh1' >bh1 hg add bh1 hg commit -d '3 0' -m "Adding b branch head 1" hg update -C 2 echo 'bh2' >bh2 hg add bh2 hg commit -d '4 0' -m "Adding b branch head 2" echo 'c' >c hg add c hg branch c hg commit -d '5 0' -m "Adding c branch" echo 'd' >d hg add d hg branch 'a branch name much longer than the default justification used by branches' hg commit -d '6 0' -m "Adding d branch" hg branches echo '-------' hg branches -a echo "--- Branch a" hg log -b a echo "---- Branch b" hg log -b b echo "---- going to test branch closing" hg branches hg up -C b echo 'xxx1' >> b hg commit -d '7 0' -m 'adding cset to branch b' hg up -C aee39cd168d0 echo 'xxx2' >> b hg commit -d '8 0' -m 'adding head to branch b' echo 'xxx3' >> b hg commit -d '9 0' -m 'adding another cset to branch b' hg branches hg heads --closed hg heads hg commit -d '9 0' --close-branch -m 'prune bad branch' hg branches -a hg up -C b hg commit -d '9 0' --close-branch -m 'close this part branch too' echo '--- b branch should be inactive' hg branches hg branches -c hg branches -a hg heads b hg heads --closed b echo 'xxx4' >> b hg commit -d '9 0' -m 'reopen branch with a change' echo '--- branch b is back in action' hg branches -a echo '---- test heads listings' hg heads echo '% branch default' hg heads default echo '% branch a' hg heads a hg heads --active a echo '% branch b' hg heads b hg heads --closed b