Mercurial > hg
annotate tests/test-revlog-group-emptyiter @ 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 | aaaf4af1c173 |
children |
rev | line source |
---|---|
8635
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
1 #! /bin/sh |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
2 |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
3 # issue 1678 |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
4 |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
5 echo "# -- setting up base repo" |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
6 hg init a |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
7 cd a |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
8 touch a |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
9 hg ci -Am a |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
10 cd .. |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
11 |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
12 echo "# -- cloning base repo" |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
13 hg clone a b |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
14 cd b |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
15 |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
16 echo "# -- setting up cset to push" |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
17 hg up null |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
18 touch a |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
19 hg ci -Am b # different msg so we get a clog new entry |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
20 |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
21 echo "# -- pushing" |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
22 hg push -f ../a |
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
23 |