Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-patchbomb @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | ec431334e4fc |
children |
rev | line source |
---|---|
4420
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 #!/bin/sh |
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 |
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 echo "[extensions]" >> $HGRCPATH |
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 echo "patchbomb=" >> $HGRCPATH |
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 |
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 hg init |
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 echo a > a |
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 hg commit -Ama -d '1 0' |
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 |
4565
8b87bd4fb7ce
Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4564
diff
changeset
|
10 hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar tip | \ |
8b87bd4fb7ce
Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4564
diff
changeset
|
11 sed -e 's/\(Message-Id:.*@\).*/\1/' |
4420
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 |
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 echo b > b |
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 hg commit -Amb -d '2 0' |
b0656b33cc02
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 |
4565
8b87bd4fb7ce
Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4564
diff
changeset
|
16 hg email --date '1970-1-1 0:2' -n -f quux -t foo -c bar -s test 0:tip | \ |
4566
9b3a818adae6
test-patchbomb: sed -e may not work with extended regexps
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
4565
diff
changeset
|
17 sed -e 's/\(Message-Id:.*@\).*/\1/' | \ |
9b3a818adae6
test-patchbomb: sed -e may not work with extended regexps
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
4565
diff
changeset
|
18 sed -e 's/\(In-Reply-To:.*@\).*/\1/' |
4563
1cf908c00479
Don't validate email config if we're not sending email.
Bryan O'Sullivan <bos@serpentine.com>
parents:
4420
diff
changeset
|
19 |
4565
8b87bd4fb7ce
Correct tests/test-patchbomb* files:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4564
diff
changeset
|
20 hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip |