Mercurial > hg
annotate tests/test-committer @ 4416:bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
We make better use of contexts to accurately identify copies that
don't need merges.
Add a simple test and update other tests.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 May 2007 02:59:13 -0500 |
parents | 78a0dd93db0b |
children | c5b3d3e30de7 |
rev | line source |
---|---|
2104
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
1 #!/bin/sh |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
2 |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
3 unset HGUSER |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
4 EMAIL="My Name <myname@example.com>" |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
5 export EMAIL |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
6 |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
7 hg init test |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
8 cd test |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
9 touch asdf |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
10 hg add asdf |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
11 hg commit -d '1000000 0' -m commit-1 |
f1085d34d20d
Add tests/test-committer
Andrew Thompson <andrewkt@aktzero.com>
parents:
diff
changeset
|
12 hg tip |
3466
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
13 |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
14 unset EMAIL |
3721
98f2507c5551
only print a warning when no username is specified
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3466
diff
changeset
|
15 echo 1234 > asdf |
3466
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
16 hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1 |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
17 hg tip |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
18 echo "[ui]" >> .hg/hgrc |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
19 echo "username = foobar <foo@bar.com>" >> .hg/hgrc |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
20 echo 12 > asdf |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
21 hg commit -d '1000000 0' -m commit-1 |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
22 hg tip |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
23 echo 1 > asdf |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
24 hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1 |
8b55c0ba8048
makes username mandatory
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2104
diff
changeset
|
25 hg tip |
3721
98f2507c5551
only print a warning when no username is specified
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3466
diff
changeset
|
26 echo 123 > asdf |
4044
78a0dd93db0b
Abort on empty username so specifying a username can be forced.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3722
diff
changeset
|
27 echo "[ui]" > .hg/hgrc |
78a0dd93db0b
Abort on empty username so specifying a username can be forced.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3722
diff
changeset
|
28 echo "username = " >> .hg/hgrc |
78a0dd93db0b
Abort on empty username so specifying a username can be forced.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3722
diff
changeset
|
29 hg commit -d '1000000 0' -m commit-1 |
3721
98f2507c5551
only print a warning when no username is specified
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3466
diff
changeset
|
30 rm .hg/hgrc |
3722
5191e2299d63
Make sed expression in test-committer compatible with GNU sed 3.x.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3721
diff
changeset
|
31 hg commit -d '1000000 0' -m commit-1 2>&1 | sed -e "s/'[^']*'/user@host/" |