Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-flags @ 4586:1fcc076fcb17
Make parents with a file but not a revision use working directory revision.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 14 Jun 2007 10:58:49 -0700 |
parents | c0b449154a90 |
children | 0ac7fee4f024 |
rev | line source |
---|---|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 #!/bin/sh -e |
412 | 2 |
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
440
diff
changeset
|
3 umask 027 |
412 | 4 mkdir test1 |
5 cd test1 | |
6 | |
7 hg init | |
8 touch a b | |
9 hg add a b | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1923
diff
changeset
|
10 hg ci -m "added a b" -d "1000000 0" |
412 | 11 |
12 cd .. | |
3298
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
13 hg clone test1 test3 |
412 | 14 mkdir test2 |
15 cd test2 | |
16 | |
17 hg init | |
440 | 18 hg pull ../test1 |
412 | 19 hg co |
20 chmod +x a | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1923
diff
changeset
|
21 hg ci -m "chmod +x a" -d "1000000 0" |
412 | 22 |
23 cd ../test1 | |
24 echo 123 >>a | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1923
diff
changeset
|
25 hg ci -m "a updated" -d "1000000 0" |
412 | 26 |
440 | 27 hg pull ../test2 |
412 | 28 hg heads |
29 hg history | |
30 | |
2283
e506c14382fd
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
31 hg -v merge |
412 | 32 |
3298
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
33 cd ../test3 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
34 echo 123 >>b |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
35 hg ci -m "b updated" -d "1000000 0" |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
36 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
37 hg pull ../test2 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
38 hg heads |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
39 hg history |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
40 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
41 hg -v merge |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
42 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2283
diff
changeset
|
43 ls -l ../test[123]/a > foo |
1923
7d83a351a936
fix testsuite for freebsd and one timingissue
Peter van Dijk <peter@dataloss.nl>
parents:
814
diff
changeset
|
44 cut -b 1-10 < foo |
412 | 45 |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3298
diff
changeset
|
46 hg debugindex .hg/store/data/a.i |
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3298
diff
changeset
|
47 hg debugindex ../test2/.hg/store/data/a.i |
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3298
diff
changeset
|
48 hg debugindex ../test1/.hg/store/data/a.i |