Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-flags @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:14:29 +0200 |
parents | e506c14382fd |
children | 455109df3669 |
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 .. | |
13 mkdir test2 | |
14 cd test2 | |
15 | |
16 hg init | |
440 | 17 hg pull ../test1 |
412 | 18 hg co |
19 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
|
20 hg ci -m "chmod +x a" -d "1000000 0" |
412 | 21 |
22 cd ../test1 | |
23 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
|
24 hg ci -m "a updated" -d "1000000 0" |
412 | 25 |
440 | 26 hg pull ../test2 |
412 | 27 hg heads |
28 hg history | |
29 | |
2283
e506c14382fd
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
30 hg -v merge |
412 | 31 |
32 ls -l ../test[12]/a > foo | |
1923
7d83a351a936
fix testsuite for freebsd and one timingissue
Peter van Dijk <peter@dataloss.nl>
parents:
814
diff
changeset
|
33 cut -b 1-10 < foo |
412 | 34 |