Mercurial > hg

annotate tests/test-merge4 @ 695:085a8145e151

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed tests. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed tests. manifest hash: f6f36e6f95ea99efccc84dfa1d0af63d414a0eba -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1hsCW7P1GVgWeRoRAtbyAJoDpbSygoutryu3P/miCpX2Q/LA8gCgiClo P+1ZpH0gycio/V4CKmj5Hlo= =JVBT -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Jul 2005 08:57:54 +0100
parents 5e9e8b8d2629
children 7e4843b7efd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
416
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
1 #!/bin/sh -x
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
2
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
3 hg init
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
4 echo This is file a1 > a
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
5 hg add a
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
6 hg commit -t "commit #0" -d "0 0" -u user
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
7 echo This is file b1 > b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
8 hg add b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
9 hg commit -t "commit #1" -d "0 0" -u user
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
10 hg update 0
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
11 echo This is file c1 > c
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
12 hg add c
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
13 hg commit -t "commit #2" -d "0 0" -u user
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
14 hg update -m 1
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
15 rm b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
16 echo This is file c22 > c
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
17 hg commit -t "commit #3" -d "0 0" -u user