Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge-revert2.out @ 801:1f9ec150a476
Updated output of tests.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 15:21:02 +0100 |
parents | 49ec802b4a16 |
children | 8f5637f0a0c0 |
comparison
equal
deleted
inserted
replaced
800:ec85f9e6f3b1 | 801:1f9ec150a476 |
---|---|
1 + mkdir t | |
2 + cd t | |
3 + hg init | 1 + hg init |
4 + echo 'added file1' | |
5 + echo 'added file2' | |
6 + hg add file1 file2 | 2 + hg add file1 file2 |
7 + hg commit -m 'added file1 and file2' -d '0 0' -u user | 3 + hg commit -m added file1 and file2 -d 0 0 -u user |
8 + echo 'changed file1' | 4 + hg commit -m changed file1 -d 0 0 -u user |
9 + hg commit -m 'changed file1' -d '0 0' -u user | |
10 + hg -q log | 5 + hg -q log |
11 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c | 6 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c |
12 0:8633637036c18f021d771208e16ae3508ab81d28 | 7 0:8633637036c18f021d771208e16ae3508ab81d28 |
13 + hg id | 8 + hg id |
14 3aa14bbc23d9 tip | 9 3aa14bbc23d9 tip |
15 + hg update -C 0 | 10 + hg update -C 0 |
16 + hg id | 11 + hg id |
17 8633637036c1 | 12 8633637036c1 |
18 + echo 'changed file1' | |
19 + hg id | 13 + hg id |
20 8633637036c1+ | 14 8633637036c1+ |
21 + hg revert | 15 + hg revert |
22 + hg diff | 16 + hg diff |
23 + hg status | 17 + hg status |
27 + hg diff | 21 + hg diff |
28 + hg status | 22 + hg status |
29 + hg id | 23 + hg id |
30 3aa14bbc23d9 tip | 24 3aa14bbc23d9 tip |
31 + hg update -C 0 | 25 + hg update -C 0 |
32 + echo 'changed file1 different' | |
33 + HGMERGE=merge | |
34 + hg update | 26 + hg update |
35 merge: warning: conflicts during merge | 27 merge: warning: conflicts during merge |
36 merging file1 | 28 merging file1 |
37 merging file1 failed! | 29 merging file1 failed! |
38 + hg diff | 30 + hg diff |
39 + sed -e 's/\(\(---\|+++\).*\)\t.*/\1/' -e 's/\(<<<<<<<\|>>>>>>>\) .*/\1/' | |
40 diff -r 3aa14bbc23d9 file1 | 31 diff -r 3aa14bbc23d9 file1 |
41 --- a/file1 | 32 --- a/file1 |
42 +++ b/file1 | 33 +++ b/file1 |
43 @@ -1,2 +1,6 @@ | 34 @@ -1,2 +1,6 @@ |
44 added file1 | 35 added file1 |
64 + hg update -C | 55 + hg update -C |
65 + hg diff | 56 + hg diff |
66 + hg status | 57 + hg status |
67 + hg id | 58 + hg id |
68 3aa14bbc23d9 tip | 59 3aa14bbc23d9 tip |
69 + cd .. | |
70 + /bin/rm -rf t |