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