Mercurial > hg-stable
annotate tests/test-conflict @ 7327:a1758089ee35
Kill trailing whitespace in templates
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 07 Nov 2008 13:02:02 +0100 |
| parents | 93a4e72b4f83 |
| children |
| rev | line source |
|---|---|
|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
392
diff
changeset
|
1 #!/bin/sh |
| 346 | 2 |
| 3 hg init | |
| 4 echo "nothing" > a | |
| 5 hg add a | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1925
diff
changeset
|
6 hg commit -m ancestor -d "1000000 0" |
| 346 | 7 echo "something" > a |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1925
diff
changeset
|
8 hg commit -m branch1 -d "1000000 0" |
| 346 | 9 hg co 0 |
| 10 echo "something else" > a | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1925
diff
changeset
|
11 hg commit -m branch2 -d "1000000 0" |
|
2283
e506c14382fd
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
12 hg merge 1 |
| 346 | 13 hg id |
|
4387
93a4e72b4f83
run-tests.py: pass -L/--label to simplemerge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4365
diff
changeset
|
14 cat a |
| 346 | 15 hg status |