Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge6.out @ 749:7e4843b7efd2
Update tests to use commit -m and default -u
manifest hash: 6e4385453843031a712005a320d6000595b40d05
author | mpm@selenic.com |
---|---|
date | Thu, 21 Jul 2005 15:05:17 -0500 |
parents | 32f7dc81c07e |
children | 122449dd89db 445970ccf57a |
comparison
equal
deleted
inserted
replaced
748:c5df1a9c5276 | 749:7e4843b7efd2 |
---|---|
6 + cd A1 | 6 + cd A1 |
7 + hg init | 7 + hg init |
8 + echo This is file foo1 | 8 + echo This is file foo1 |
9 + echo This is file bar1 | 9 + echo This is file bar1 |
10 + hg add foo bar | 10 + hg add foo bar |
11 + hg commit -t 'commit text' -d '0 0' -u user | 11 + hg commit -m 'commit text' -d '0 0' |
12 + cd .. | 12 + cd .. |
13 + hg clone A1 B1 | 13 + hg clone A1 B1 |
14 + cd A1 | 14 + cd A1 |
15 + rm bar | 15 + rm bar |
16 + hg remove bar | 16 + hg remove bar |
17 + hg commit -t 'commit test' -d '0 0' -u user | 17 + hg commit -m 'commit test' -d '0 0' |
18 + cd ../B1 | 18 + cd ../B1 |
19 + echo This is file foo22 | 19 + echo This is file foo22 |
20 + hg commit -t 'commit test' -d '0 0' -u user | 20 + hg commit -m 'commit test' -d '0 0' |
21 + cd .. | 21 + cd .. |
22 + hg clone A1 A2 | 22 + hg clone A1 A2 |
23 + hg clone B1 B2 | 23 + hg clone B1 B2 |
24 + cd A1 | 24 + cd A1 |
25 + hg pull ../B1 | 25 + hg pull ../B1 |
29 adding manifests | 29 adding manifests |
30 adding file revisions | 30 adding file revisions |
31 modified 1 files, added 1 changesets and 1 new revisions | 31 modified 1 files, added 1 changesets and 1 new revisions |
32 (run 'hg update' to get a working copy) | 32 (run 'hg update' to get a working copy) |
33 + hg update -m | 33 + hg update -m |
34 + hg commit -t 'commit test' -d '0 0' -u user | 34 + hg commit -m 'commit test' -d '0 0' |
35 + echo bar should remain deleted. | 35 + echo bar should remain deleted. |
36 bar should remain deleted. | 36 bar should remain deleted. |
37 + hg manifest | 37 + hg manifest |
38 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo | 38 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |
39 + cd ../B2 | 39 + cd ../B2 |
44 adding manifests | 44 adding manifests |
45 adding file revisions | 45 adding file revisions |
46 modified 0 files, added 1 changesets and 0 new revisions | 46 modified 0 files, added 1 changesets and 0 new revisions |
47 (run 'hg update' to get a working copy) | 47 (run 'hg update' to get a working copy) |
48 + hg update -m | 48 + hg update -m |
49 + hg commit -t 'commit test' -d '0 0' -u user | 49 + hg commit -m 'commit test' -d '0 0' |
50 + echo bar should remain deleted. | 50 + echo bar should remain deleted. |
51 bar should remain deleted. | 51 bar should remain deleted. |
52 + hg manifest | 52 + hg manifest |
53 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo | 53 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |