Mercurial > hg
annotate tests/test-merge2.out @ 770:b3820ce0e88a
Fix bug in exception handling for hardlink clone
author | mpm@selenic.com |
---|---|
date | Sat, 23 Jul 2005 10:14:42 -0500 |
parents | 61ed30e82b27 |
children | 1f9ec150a476 8f5637f0a0c0 0902ffece4b4 |
rev | line source |
---|---|
409 | 1 + mkdir t |
2 + cd t | |
3 + hg init | |
4 + echo This is file a1 | |
5 + hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
6 + hg commit -m 'commit #0' -d '0 0' |
409 | 7 + echo This is file b1 |
8 + hg add b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
9 + hg commit -m 'commit #1' -d '0 0' |
409 | 10 + rm b |
11 + hg update 0 | |
12 + echo This is file b2 | |
13 + hg add b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
14 + hg commit -m 'commit #2' -d '0 0' |
409 | 15 + cd .. |
16 + /bin/rm -rf t | |
17 + mkdir t | |
18 + cd t | |
19 + hg init | |
20 + echo This is file a1 | |
21 + hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
22 + hg commit -m 'commit #0' -d '0 0' |
409 | 23 + echo This is file b1 |
24 + hg add b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
25 + hg commit -m 'commit #1' -d '0 0' |
409 | 26 + rm b |
27 + hg update 0 | |
28 + echo This is file b2 | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
29 + hg commit -A -m 'commit #2' -d '0 0' |
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
30 adding b |
409 | 31 + cd .. |
32 + /bin/rm -rf t | |
33 + mkdir t | |
34 + cd t | |
35 + hg init | |
36 + echo This is file a1 | |
37 + hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
38 + hg commit -m 'commit #0' -d '0 0' |
409 | 39 + echo This is file b1 |
40 + hg add b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
41 + hg commit -m 'commit #1' -d '0 0' |
409 | 42 + rm b |
43 + hg remove b | |
44 + hg update 0 | |
45 + echo This is file b2 | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
46 + hg commit -A -m 'commit #2' -d '0 0' |
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
47 adding b |
409 | 48 + cd .. |
49 + /bin/rm -rf t |