| author | Bryan O'Sullivan <bos@serpentine.com> |
| Fri, 29 Jul 2005 08:49:01 -0800 | |
| changeset 810 | 790a0ff306f2 |
| parent 749 | 7e4843b7efd2 |
| child 800 | ec85f9e6f3b1 |
| child 808 | 8f5637f0a0c0 |
| child 814 | 0902ffece4b4 |
| 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 |
set -x |
|
4 |
hg init |
|
5 |
echo "nothing" > a |
|
6 |
hg add a |
|
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
7 |
hg commit -m ancestor -d "0 0" |
| 346 | 8 |
echo "something" > a |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
9 |
hg commit -m branch1 -d "0 0" |
| 346 | 10 |
hg co 0 |
11 |
echo "something else" > a |
|
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
12 |
hg commit -m branch2 -d "0 0" |
| 346 | 13 |
export HGMERGE=merge |
| 591 | 14 |
hg up -m 1 |
| 346 | 15 |
hg id |
| 392 | 16 |
grep -Ev ">>>|<<<" a |
| 346 | 17 |
hg status |