Mercurial > hg
annotate tests/test-default-push @ 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 | 6dbb8ae0a0b3 |
children |
rev | line source |
---|---|
2496
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 #!/bin/sh |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
2 |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
3 hg init a |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
4 echo a > a/a |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
5 hg --cwd a ci -Ama |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 hg clone a c |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 hg clone a b |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
10 echo b >> b/a |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
11 hg --cwd b ci -mb |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
12 |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 echo % push should push to default when default-push not set |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
14 hg --cwd b push | sed 's/pushing to.*/pushing/' |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
16 echo % push should push to default-push when set |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
17 echo 'default-push = ../c' >> b/.hg/hgrc |
6dbb8ae0a0b3
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
18 hg --cwd b push | sed 's/pushing to.*/pushing/' |