Show More
@@ -0,0 +1,45 b'' | |||||
|
1 | #!/bin/sh -x | |||
|
2 | ||||
|
3 | mkdir t | |||
|
4 | cd t | |||
|
5 | hg init | |||
|
6 | echo "added file1" > file1 | |||
|
7 | echo "added file2" > file2 | |||
|
8 | hg add file1 file2 | |||
|
9 | hg commit -m "added file1 and file2" -d "0 0" -u user | |||
|
10 | echo "changed file1" >> file1 | |||
|
11 | hg commit -m "changed file1" -d "0 0" -u user | |||
|
12 | hg -q log | |||
|
13 | hg id | |||
|
14 | hg update -C 0 | |||
|
15 | hg id | |||
|
16 | echo "changed file1" >> file1 | |||
|
17 | hg id | |||
|
18 | hg revert | |||
|
19 | hg diff | |||
|
20 | hg status | |||
|
21 | hg id | |||
|
22 | hg update | |||
|
23 | hg diff | |||
|
24 | hg status | |||
|
25 | hg id | |||
|
26 | hg update -C 0 | |||
|
27 | echo "changed file1" >> file1 | |||
|
28 | HGMERGE=merge hg update | |||
|
29 | hg diff | |||
|
30 | hg status | |||
|
31 | hg id | |||
|
32 | hg revert | |||
|
33 | hg diff | |||
|
34 | hg status | |||
|
35 | hg id | |||
|
36 | hg revert -r tip | |||
|
37 | hg diff | |||
|
38 | hg status | |||
|
39 | hg id | |||
|
40 | hg update -C | |||
|
41 | hg diff | |||
|
42 | hg status | |||
|
43 | hg id | |||
|
44 | cd ..; /bin/rm -rf t | |||
|
45 |
@@ -0,0 +1,56 b'' | |||||
|
1 | + mkdir t | |||
|
2 | + cd t | |||
|
3 | + hg init | |||
|
4 | + echo 'added file1' | |||
|
5 | + echo 'added file2' | |||
|
6 | + hg add file1 file2 | |||
|
7 | + hg commit -m 'added file1 and file2' -d '0 0' -u user | |||
|
8 | + echo 'changed file1' | |||
|
9 | + hg commit -m 'changed file1' -d '0 0' -u user | |||
|
10 | + hg -q log | |||
|
11 | 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c | |||
|
12 | 0:8633637036c18f021d771208e16ae3508ab81d28 | |||
|
13 | + hg id | |||
|
14 | 3aa14bbc23d9 tip | |||
|
15 | + hg update -C 0 | |||
|
16 | + hg id | |||
|
17 | 8633637036c1 | |||
|
18 | + echo 'changed file1' | |||
|
19 | + hg id | |||
|
20 | 8633637036c1+ | |||
|
21 | + hg revert | |||
|
22 | + hg diff | |||
|
23 | + hg status | |||
|
24 | + hg id | |||
|
25 | 8633637036c1 | |||
|
26 | + hg update | |||
|
27 | + hg diff | |||
|
28 | + hg status | |||
|
29 | + hg id | |||
|
30 | 3aa14bbc23d9 tip | |||
|
31 | + hg update -C 0 | |||
|
32 | + echo 'changed file1' | |||
|
33 | + HGMERGE=merge | |||
|
34 | + hg update | |||
|
35 | merging file1 | |||
|
36 | + hg diff | |||
|
37 | + hg status | |||
|
38 | + hg id | |||
|
39 | 3aa14bbc23d9 tip | |||
|
40 | + hg revert | |||
|
41 | + hg diff | |||
|
42 | + hg status | |||
|
43 | + hg id | |||
|
44 | 3aa14bbc23d9 tip | |||
|
45 | + hg revert -r tip | |||
|
46 | + hg diff | |||
|
47 | + hg status | |||
|
48 | + hg id | |||
|
49 | 3aa14bbc23d9 tip | |||
|
50 | + hg update -C | |||
|
51 | + hg diff | |||
|
52 | + hg status | |||
|
53 | + hg id | |||
|
54 | 3aa14bbc23d9 tip | |||
|
55 | + cd .. | |||
|
56 | + /bin/rm -rf t |
@@ -0,0 +1,45 b'' | |||||
|
1 | #!/bin/sh -x | |||
|
2 | ||||
|
3 | mkdir t | |||
|
4 | cd t | |||
|
5 | hg init | |||
|
6 | echo "added file1" > file1 | |||
|
7 | echo "added file2" > file2 | |||
|
8 | hg add file1 file2 | |||
|
9 | hg commit -m "added file1 and file2" -d "0 0" -u user | |||
|
10 | echo "changed file1" >> file1 | |||
|
11 | hg commit -m "changed file1" -d "0 0" -u user | |||
|
12 | hg -q log | |||
|
13 | hg id | |||
|
14 | hg update -C 0 | |||
|
15 | hg id | |||
|
16 | echo "changed file1" >> file1 | |||
|
17 | hg id | |||
|
18 | hg revert | |||
|
19 | hg diff | |||
|
20 | hg status | |||
|
21 | hg id | |||
|
22 | hg update | |||
|
23 | hg diff | |||
|
24 | hg status | |||
|
25 | hg id | |||
|
26 | hg update -C 0 | |||
|
27 | echo "changed file1 different" >> file1 | |||
|
28 | HGMERGE=merge hg update | |||
|
29 | hg diff | sed -e "s/\(\(---\|+++\).*\)\t.*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" | |||
|
30 | hg status | |||
|
31 | hg id | |||
|
32 | hg revert | |||
|
33 | hg diff | |||
|
34 | hg status | |||
|
35 | hg id | |||
|
36 | hg revert -r tip | |||
|
37 | hg diff | |||
|
38 | hg status | |||
|
39 | hg id | |||
|
40 | hg update -C | |||
|
41 | hg diff | |||
|
42 | hg status | |||
|
43 | hg id | |||
|
44 | cd ..; /bin/rm -rf t | |||
|
45 |
@@ -0,0 +1,70 b'' | |||||
|
1 | + mkdir t | |||
|
2 | + cd t | |||
|
3 | + hg init | |||
|
4 | + echo 'added file1' | |||
|
5 | + echo 'added file2' | |||
|
6 | + hg add file1 file2 | |||
|
7 | + hg commit -m 'added file1 and file2' -d '0 0' -u user | |||
|
8 | + echo 'changed file1' | |||
|
9 | + hg commit -m 'changed file1' -d '0 0' -u user | |||
|
10 | + hg -q log | |||
|
11 | 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c | |||
|
12 | 0:8633637036c18f021d771208e16ae3508ab81d28 | |||
|
13 | + hg id | |||
|
14 | 3aa14bbc23d9 tip | |||
|
15 | + hg update -C 0 | |||
|
16 | + hg id | |||
|
17 | 8633637036c1 | |||
|
18 | + echo 'changed file1' | |||
|
19 | + hg id | |||
|
20 | 8633637036c1+ | |||
|
21 | + hg revert | |||
|
22 | + hg diff | |||
|
23 | + hg status | |||
|
24 | + hg id | |||
|
25 | 8633637036c1 | |||
|
26 | + hg update | |||
|
27 | + hg diff | |||
|
28 | + hg status | |||
|
29 | + hg id | |||
|
30 | 3aa14bbc23d9 tip | |||
|
31 | + hg update -C 0 | |||
|
32 | + echo 'changed file1 different' | |||
|
33 | + HGMERGE=merge | |||
|
34 | + hg update | |||
|
35 | merge: warning: conflicts during merge | |||
|
36 | merging file1 | |||
|
37 | merging file1 failed! | |||
|
38 | + hg diff | |||
|
39 | + sed -e 's/\(\(---\|+++\).*\)\t.*/\1/' -e 's/\(<<<<<<<\|>>>>>>>\) .*/\1/' | |||
|
40 | diff -r 3aa14bbc23d9 file1 | |||
|
41 | --- a/file1 | |||
|
42 | +++ b/file1 | |||
|
43 | @@ -1,2 +1,6 @@ | |||
|
44 | added file1 | |||
|
45 | +<<<<<<< | |||
|
46 | +changed file1 different | |||
|
47 | +======= | |||
|
48 | changed file1 | |||
|
49 | +>>>>>>> | |||
|
50 | + hg status | |||
|
51 | M file1 | |||
|
52 | + hg id | |||
|
53 | 3aa14bbc23d9+ tip | |||
|
54 | + hg revert | |||
|
55 | + hg diff | |||
|
56 | + hg status | |||
|
57 | + hg id | |||
|
58 | 3aa14bbc23d9 tip | |||
|
59 | + hg revert -r tip | |||
|
60 | + hg diff | |||
|
61 | + hg status | |||
|
62 | + hg id | |||
|
63 | 3aa14bbc23d9 tip | |||
|
64 | + hg update -C | |||
|
65 | + hg diff | |||
|
66 | + hg status | |||
|
67 | + hg id | |||
|
68 | 3aa14bbc23d9 tip | |||
|
69 | + cd .. | |||
|
70 | + /bin/rm -rf t |
General Comments 0
You need to be logged in to leave comments.
Login now