| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
| Sat, 10 Mar 2007 23:00:42 -0300 | |
| changeset 4183 | 6f9474044736 |
| parent 2283 | e506c14382fd |
| child 4365 | 46280c004f22 |
| permissions | -rwxr-xr-x |
|
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" |
|
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
|
12 |
HGMERGE=merge; export HGMERGE |
|
2283
e506c14382fd
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
13 |
hg merge 1 |
| 346 | 14 |
hg id |
|
1925
c71420b186b0
small solaris portability fixes from John Levon <levon@movementarian.org>
Peter van Dijk <peter@dataloss.nl>
parents:
814
diff
changeset
|
15 |
egrep -v ">>>|<<<" a |
| 346 | 16 |
hg status |