Show More
@@ -1,32 +1,32 b'' | |||||
1 | + hg init |
|
1 | + hg init | |
2 | + echo nothing |
|
2 | + echo nothing | |
3 | + hg add a |
|
3 | + hg add a | |
4 | + hg commit -t ancestor -u test -d '0 0' |
|
4 | + hg commit -t ancestor -u test -d '0 0' | |
5 | + echo something |
|
5 | + echo something | |
6 | + hg commit -t branch1 -u test -d '0 0' |
|
6 | + hg commit -t branch1 -u test -d '0 0' | |
7 | + hg co 0 |
|
7 | + hg co 0 | |
8 | + echo 'something else' |
|
8 | + echo 'something else' | |
9 | + hg commit -t branch2 -u test -d '0 0' |
|
9 | + hg commit -t branch2 -u test -d '0 0' | |
10 | + export HGMERGE=merge |
|
10 | + export HGMERGE=merge | |
11 | + HGMERGE=merge |
|
11 | + HGMERGE=merge | |
12 | + hg -d up -m 1 |
|
12 | + hg -d up -m 1 | |
13 | merge: warning: conflicts during merge |
|
13 | merge: warning: conflicts during merge | |
14 | resolving manifests |
|
14 | resolving manifests | |
15 | ancestor 1c6e5a12 local 35fedfab remote a5801785 |
|
15 | ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc | |
16 | a versions differ, resolve |
|
16 | a versions differ, resolve | |
17 | working dir created .out, keeping |
|
17 | working dir created .out, keeping | |
18 | merging a |
|
18 | merging a | |
19 | resolving a |
|
19 | resolving a | |
20 | file a: other d7250518 ancestor 68ba9db7 |
|
20 | file a: other d7250518cb1b ancestor 68ba9db7a9e4 | |
21 | merging a failed! |
|
21 | merging a failed! | |
22 | + hg id |
|
22 | + hg id | |
23 | 32e80765+75234512+ tip |
|
23 | 32e80765d7fe+75234512624c+ tip | |
24 | + cat a |
|
24 | + cat a | |
25 | + grep -v '>>>' |
|
25 | + grep -v '>>>' | |
26 | + grep -v '<<<' |
|
26 | + grep -v '<<<' | |
27 | something else |
|
27 | something else | |
28 | ======= |
|
28 | ======= | |
29 | something |
|
29 | something | |
30 | + hg status |
|
30 | + hg status | |
31 | C a |
|
31 | C a | |
32 | ? .out |
|
32 | ? .out |
@@ -1,47 +1,47 b'' | |||||
1 | + mkdir t |
|
1 | + mkdir t | |
2 | + cd t |
|
2 | + cd t | |
3 | + hg init |
|
3 | + hg init | |
4 | + hg id |
|
4 | + hg id | |
5 | unknown |
|
5 | unknown | |
6 | + echo a |
|
6 | + echo a | |
7 | + hg add a |
|
7 | + hg add a | |
8 | + hg commit -t test -u test -d '0 0' |
|
8 | + hg commit -t test -u test -d '0 0' | |
9 | + hg co |
|
9 | + hg co | |
10 | + hg identify |
|
10 | + hg identify | |
11 | acb14030 tip |
|
11 | acb14030fe0a tip | |
12 | ++ hg -q tip |
|
12 | ++ hg -q tip | |
13 | ++ cut -d : -f 2 |
|
13 | ++ cut -d : -f 2 | |
14 | + T=acb14030fe0a21b60322c440ad2d20cf7685a376 |
|
14 | + T=acb14030fe0a21b60322c440ad2d20cf7685a376 | |
15 | + echo 'acb14030fe0a21b60322c440ad2d20cf7685a376 first' |
|
15 | + echo 'acb14030fe0a21b60322c440ad2d20cf7685a376 first' | |
16 | + cat .hgtags |
|
16 | + cat .hgtags | |
17 | acb14030fe0a21b60322c440ad2d20cf7685a376 first |
|
17 | acb14030fe0a21b60322c440ad2d20cf7685a376 first | |
18 | + hg add .hgtags |
|
18 | + hg add .hgtags | |
19 | + hg commit -t 'add tags' -u test -d '0 0' |
|
19 | + hg commit -t 'add tags' -u test -d '0 0' | |
20 | + hg tags |
|
20 | + hg tags | |
21 | tip 1:b9154636be938d3d431e75a7c906504a079bfe07 |
|
21 | tip 1:b9154636be938d3d431e75a7c906504a079bfe07 | |
22 | first 0:acb14030fe0a21b60322c440ad2d20cf7685a376 |
|
22 | first 0:acb14030fe0a21b60322c440ad2d20cf7685a376 | |
23 | + hg identify |
|
23 | + hg identify | |
24 | b9154636 tip |
|
24 | b9154636be93 tip | |
25 | + echo bb |
|
25 | + echo bb | |
26 | + hg status |
|
26 | + hg status | |
27 | C a |
|
27 | C a | |
28 | + hg identify |
|
28 | + hg identify | |
29 | b9154636+ tip |
|
29 | b9154636be93+ tip | |
30 | + hg co first |
|
30 | + hg co first | |
31 | + hg id |
|
31 | + hg id | |
32 | acb14030+ first |
|
32 | acb14030fe0a+ first | |
33 | + hg -v id |
|
33 | + hg -v id | |
34 | acb14030fe0a21b60322c440ad2d20cf7685a376+ first |
|
34 | acb14030fe0a21b60322c440ad2d20cf7685a376+ first | |
35 | + hg status |
|
35 | + hg status | |
36 | C a |
|
36 | C a | |
37 | + echo 1 |
|
37 | + echo 1 | |
38 | + hg add b |
|
38 | + hg add b | |
39 | + hg commit -t branch -u test -d '0 0' |
|
39 | + hg commit -t branch -u test -d '0 0' | |
40 | + hg id |
|
40 | + hg id | |
41 | c8edf041 tip |
|
41 | c8edf04160c7 tip | |
42 | + hg co -m 1 |
|
42 | + hg co -m 1 | |
43 | + hg id |
|
43 | + hg id | |
44 | c8edf041+b9154636+ tip |
|
44 | c8edf04160c7+b9154636be93+ tip | |
45 | + hg status |
|
45 | + hg status | |
46 | C a |
|
46 | C a | |
47 | C .hgtags |
|
47 | C .hgtags |
@@ -1,70 +1,70 b'' | |||||
1 | + mkdir r1 |
|
1 | + mkdir r1 | |
2 | + cd r1 |
|
2 | + cd r1 | |
3 | + hg init |
|
3 | + hg init | |
4 | + echo a |
|
4 | + echo a | |
5 | + hg addremove |
|
5 | + hg addremove | |
6 | + hg commit -t 1 -u test -d '0 0' |
|
6 | + hg commit -t 1 -u test -d '0 0' | |
7 | + cd .. |
|
7 | + cd .. | |
8 | + mkdir r2 |
|
8 | + mkdir r2 | |
9 | + cd r2 |
|
9 | + cd r2 | |
10 | + hg init ../r1 |
|
10 | + hg init ../r1 | |
11 | + hg up |
|
11 | + hg up | |
12 | + echo abc |
|
12 | + echo abc | |
13 | + hg diff |
|
13 | + hg diff | |
14 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
|
14 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | |
15 | --- a/a |
|
15 | --- a/a | |
16 | +++ b/a |
|
16 | +++ b/a | |
17 | @@ -1,1 +1,1 @@ |
|
17 | @@ -1,1 +1,1 @@ | |
18 | -a |
|
18 | -a | |
19 | +abc |
|
19 | +abc | |
20 | + cd ../r1 |
|
20 | + cd ../r1 | |
21 | + echo b |
|
21 | + echo b | |
22 | + echo a2 |
|
22 | + echo a2 | |
23 | + hg addremove |
|
23 | + hg addremove | |
24 | + hg commit -t 2 -u test -d '0 0' |
|
24 | + hg commit -t 2 -u test -d '0 0' | |
25 | + cd ../r2 |
|
25 | + cd ../r2 | |
26 | + hg -q pull ../r1 |
|
26 | + hg -q pull ../r1 | |
27 | + hg status |
|
27 | + hg status | |
28 | C a |
|
28 | C a | |
29 | + hg -d up |
|
29 | + hg -d up | |
30 | resolving manifests |
|
30 | resolving manifests | |
31 | ancestor a0c8bcbb local a0c8bcbb remote 1165e8bd |
|
31 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e | |
32 | a versions differ, resolve |
|
32 | a versions differ, resolve | |
33 | remote created b |
|
33 | remote created b | |
34 | getting b |
|
34 | getting b | |
35 | merging a |
|
35 | merging a | |
36 | resolving a |
|
36 | resolving a | |
37 | file a: other d730145a ancestor b789fdd9 |
|
37 | file a: other d730145abbf9 ancestor b789fdd96dc2 | |
38 | + hg -d up -m |
|
38 | + hg -d up -m | |
39 | resolving manifests |
|
39 | resolving manifests | |
40 | ancestor 1165e8bd local 1165e8bd remote 1165e8bd |
|
40 | ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e | |
41 | + hg parents |
|
41 | + hg parents | |
42 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
|
42 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
43 | user: test |
|
43 | user: test | |
44 | date: Wed Dec 31 16:00:00 1969 |
|
44 | date: Wed Dec 31 16:00:00 1969 | |
45 | summary: 2 |
|
45 | summary: 2 | |
46 |
|
46 | |||
47 | + hg -v history |
|
47 | + hg -v history | |
48 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
|
48 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
49 | manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 |
|
49 | manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 | |
50 | user: test |
|
50 | user: test | |
51 | date: Wed Dec 31 16:00:00 1969 |
|
51 | date: Wed Dec 31 16:00:00 1969 | |
52 | files: a b |
|
52 | files: a b | |
53 | description: |
|
53 | description: | |
54 | 2 |
|
54 | 2 | |
55 |
|
55 | |||
56 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
56 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
57 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
57 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
58 | user: test |
|
58 | user: test | |
59 | date: Wed Dec 31 16:00:00 1969 |
|
59 | date: Wed Dec 31 16:00:00 1969 | |
60 | files: a |
|
60 | files: a | |
61 | description: |
|
61 | description: | |
62 | 1 |
|
62 | 1 | |
63 |
|
63 | |||
64 | + hg diff |
|
64 | + hg diff | |
65 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
|
65 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | |
66 | --- a/a |
|
66 | --- a/a | |
67 | +++ b/a |
|
67 | +++ b/a | |
68 | @@ -1,1 +1,1 @@ |
|
68 | @@ -1,1 +1,1 @@ | |
69 | -a2 |
|
69 | -a2 | |
70 | +abc |
|
70 | +abc |
General Comments 0
You need to be logged in to leave comments.
Login now