equal
deleted
inserted
replaced
|
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 |