Mercurial > hg

annotate tests/test-merge2.out @ 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 feadc9697b43
children 7e4843b7efd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
1 + mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
2 + cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
3 + hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
4 + echo This is file a1
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
5 + hg add a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
6 + hg commit -t 'commit #0' -d '0 0' -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
7 + echo This is file b1
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
8 + hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
9 + hg commit -t 'commit #1' -d '0 0' -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
10 + rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
11 + hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
12 + echo This is file b2
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
13 + hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
14 + hg commit -t 'commit #2' -d '0 0' -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
15 + cd ..
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
16 + /bin/rm -rf t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
17 + mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
18 + cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
19 + hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
20 + echo This is file a1
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
21 + hg add a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
22 + hg commit -t 'commit #0' -d '0 0' -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
23 + echo This is file b1
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
24 + hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
25 + hg commit -t 'commit #1' -d '0 0' -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
26 + rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
27 + hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
28 + echo This is file b2
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
29 + hg commit -A -t 'commit #2' -d '0 0' -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
30 + cd ..
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
31 + /bin/rm -rf t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
32 + mkdir t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
33 + cd t
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
34 + hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
35 + echo This is file a1
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
36 + hg add a
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
37 + hg commit -t 'commit #0' -d '0 0' -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
38 + echo This is file b1
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
39 + hg add b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
40 + hg commit -t 'commit #1' -d '0 0' -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
41 + rm b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
42 + hg remove b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
43 + hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
44 + echo This is file b2
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
45 + hg commit -A -t 'commit #2' -d '0 0' -u user
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
46 + cd ..
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
47 + /bin/rm -rf t