Show More
@@ -1,35 +1,32 b'' | |||||
1 | + mkdir a |
|
1 | + mkdir a | |
2 | + cd a |
|
2 | + cd a | |
3 | + hg init |
|
3 | + hg init | |
4 | + echo a |
|
4 | + echo a | |
5 | + hg add a |
|
5 | + hg add a | |
6 | + hg commit -t test -u test -d '0 0' |
|
6 | + hg commit -t test -u test -d '0 0' | |
7 | + hg clone . ../b |
|
7 | + hg clone . ../b | |
8 | cloning by hardlink |
|
|||
9 | + cd ../b |
|
8 | + cd ../b | |
10 | + cat a |
|
9 | + cat a | |
11 | a |
|
10 | a | |
12 | + hg verify |
|
11 | + hg verify | |
13 | checking changesets |
|
12 | checking changesets | |
14 | checking manifests |
|
13 | checking manifests | |
15 | crosschecking files in changesets and manifests |
|
14 | crosschecking files in changesets and manifests | |
16 | checking files |
|
15 | checking files | |
17 | 1 files, 1 changesets, 1 total revisions |
|
16 | 1 files, 1 changesets, 1 total revisions | |
18 | + hg clone -U . ../c |
|
17 | + hg clone -U . ../c | |
19 | cloning by hardlink |
|
|||
20 | + cd ../c |
|
18 | + cd ../c | |
21 | + cat a |
|
19 | + cat a | |
22 | cat: a: No such file or directory |
|
20 | cat: a: No such file or directory | |
23 | + hg verify |
|
21 | + hg verify | |
24 | checking changesets |
|
22 | checking changesets | |
25 | checking manifests |
|
23 | checking manifests | |
26 | crosschecking files in changesets and manifests |
|
24 | crosschecking files in changesets and manifests | |
27 | checking files |
|
25 | checking files | |
28 | 1 files, 1 changesets, 1 total revisions |
|
26 | 1 files, 1 changesets, 1 total revisions | |
29 | + mkdir ../d |
|
27 | + mkdir ../d | |
30 | + cd ../d |
|
28 | + cd ../d | |
31 | + hg clone ../a |
|
29 | + hg clone ../a | |
32 | cloning by hardlink |
|
|||
33 | + cd a |
|
30 | + cd a | |
34 | + hg cat a |
|
31 | + hg cat a | |
35 | a |
|
32 | a |
@@ -1,56 +1,53 b'' | |||||
1 | + cat |
|
1 | + cat | |
2 | + chmod +x merge |
|
2 | + chmod +x merge | |
3 | + export HGMERGE=./merge |
|
3 | + export HGMERGE=./merge | |
4 | + HGMERGE=./merge |
|
4 | + HGMERGE=./merge | |
5 | + mkdir A1 |
|
5 | + mkdir A1 | |
6 | + cd A1 |
|
6 | + cd A1 | |
7 | + hg init |
|
7 | + hg init | |
8 | + echo This is file foo1 |
|
8 | + echo This is file foo1 | |
9 | + echo This is file bar1 |
|
9 | + echo This is file bar1 | |
10 | + hg add foo bar |
|
10 | + hg add foo bar | |
11 | + hg commit -t 'commit text' -d '0 0' -u user |
|
11 | + hg commit -t 'commit text' -d '0 0' -u user | |
12 | + cd .. |
|
12 | + cd .. | |
13 | + hg clone A1 B1 |
|
13 | + hg clone A1 B1 | |
14 | cloning by hardlink |
|
|||
15 | + cd A1 |
|
14 | + cd A1 | |
16 | + rm bar |
|
15 | + rm bar | |
17 | + hg remove bar |
|
16 | + hg remove bar | |
18 | + hg commit -t 'commit test' -d '0 0' -u user |
|
17 | + hg commit -t 'commit test' -d '0 0' -u user | |
19 | + cd ../B1 |
|
18 | + cd ../B1 | |
20 | + echo This is file foo22 |
|
19 | + echo This is file foo22 | |
21 | + hg commit -t 'commit test' -d '0 0' -u user |
|
20 | + hg commit -t 'commit test' -d '0 0' -u user | |
22 | + cd .. |
|
21 | + cd .. | |
23 | + hg clone A1 A2 |
|
22 | + hg clone A1 A2 | |
24 | cloning by hardlink |
|
|||
25 | + hg clone B1 B2 |
|
23 | + hg clone B1 B2 | |
26 | cloning by hardlink |
|
|||
27 | + cd A1 |
|
24 | + cd A1 | |
28 | + hg pull ../B1 |
|
25 | + hg pull ../B1 | |
29 | pulling from ../B1 |
|
26 | pulling from ../B1 | |
30 | searching for changes |
|
27 | searching for changes | |
31 | adding changesets |
|
28 | adding changesets | |
32 | adding manifests |
|
29 | adding manifests | |
33 | adding file revisions |
|
30 | adding file revisions | |
34 | modified 1 files, added 1 changesets and 1 new revisions |
|
31 | modified 1 files, added 1 changesets and 1 new revisions | |
35 | (run 'hg update' to get a working copy) |
|
32 | (run 'hg update' to get a working copy) | |
36 | + hg update -m |
|
33 | + hg update -m | |
37 | + hg commit -t 'commit test' -d '0 0' -u user |
|
34 | + hg commit -t 'commit test' -d '0 0' -u user | |
38 | + echo bar should remain deleted. |
|
35 | + echo bar should remain deleted. | |
39 | bar should remain deleted. |
|
36 | bar should remain deleted. | |
40 | + hg manifest |
|
37 | + hg manifest | |
41 | 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |
|
38 | 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo | |
42 | + cd ../B2 |
|
39 | + cd ../B2 | |
43 | + hg pull ../A2 |
|
40 | + hg pull ../A2 | |
44 | pulling from ../A2 |
|
41 | pulling from ../A2 | |
45 | searching for changes |
|
42 | searching for changes | |
46 | adding changesets |
|
43 | adding changesets | |
47 | adding manifests |
|
44 | adding manifests | |
48 | adding file revisions |
|
45 | adding file revisions | |
49 | modified 0 files, added 1 changesets and 0 new revisions |
|
46 | modified 0 files, added 1 changesets and 0 new revisions | |
50 | (run 'hg update' to get a working copy) |
|
47 | (run 'hg update' to get a working copy) | |
51 | + hg update -m |
|
48 | + hg update -m | |
52 | + hg commit -t 'commit test' -d '0 0' -u user |
|
49 | + hg commit -t 'commit test' -d '0 0' -u user | |
53 | + echo bar should remain deleted. |
|
50 | + echo bar should remain deleted. | |
54 | bar should remain deleted. |
|
51 | bar should remain deleted. | |
55 | + hg manifest |
|
52 | + hg manifest | |
56 | 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |
|
53 | 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |
@@ -1,39 +1,38 b'' | |||||
1 | + mkdir test |
|
1 | + mkdir test | |
2 | + cd test |
|
2 | + cd test | |
3 | + echo foo |
|
3 | + echo foo | |
4 | + hg init |
|
4 | + hg init | |
5 | + hg addremove |
|
5 | + hg addremove | |
6 | + hg commit -t 1 |
|
6 | + hg commit -t 1 | |
7 | + hg verify |
|
7 | + hg verify | |
8 | checking changesets |
|
8 | checking changesets | |
9 | checking manifests |
|
9 | checking manifests | |
10 | crosschecking files in changesets and manifests |
|
10 | crosschecking files in changesets and manifests | |
11 | checking files |
|
11 | checking files | |
12 | 1 files, 1 changesets, 1 total revisions |
|
12 | 1 files, 1 changesets, 1 total revisions | |
13 | + hg clone . ../branch |
|
13 | + hg clone . ../branch | |
14 | cloning by hardlink |
|
|||
15 | + cd ../branch |
|
14 | + cd ../branch | |
16 | + hg co |
|
15 | + hg co | |
17 | + echo bar |
|
16 | + echo bar | |
18 | + hg commit -t 2 |
|
17 | + hg commit -t 2 | |
19 | + cd ../test |
|
18 | + cd ../test | |
20 | + hg pull ../branch |
|
19 | + hg pull ../branch | |
21 | pulling from ../branch |
|
20 | pulling from ../branch | |
22 | searching for changes |
|
21 | searching for changes | |
23 | adding changesets |
|
22 | adding changesets | |
24 | adding manifests |
|
23 | adding manifests | |
25 | adding file revisions |
|
24 | adding file revisions | |
26 | modified 1 files, added 1 changesets and 1 new revisions |
|
25 | modified 1 files, added 1 changesets and 1 new revisions | |
27 | (run 'hg update' to get a working copy) |
|
26 | (run 'hg update' to get a working copy) | |
28 | + hg verify |
|
27 | + hg verify | |
29 | checking changesets |
|
28 | checking changesets | |
30 | checking manifests |
|
29 | checking manifests | |
31 | crosschecking files in changesets and manifests |
|
30 | crosschecking files in changesets and manifests | |
32 | checking files |
|
31 | checking files | |
33 | 1 files, 2 changesets, 2 total revisions |
|
32 | 1 files, 2 changesets, 2 total revisions | |
34 | + hg co |
|
33 | + hg co | |
35 | + cat foo |
|
34 | + cat foo | |
36 | foo |
|
35 | foo | |
37 | bar |
|
36 | bar | |
38 | + hg manifest |
|
37 | + hg manifest | |
39 | 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo |
|
38 | 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo |
@@ -1,77 +1,76 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 | + hg clone . ../r2 |
|
7 | + hg clone . ../r2 | |
8 | cloning by hardlink |
|
|||
9 | + cd ../r2 |
|
8 | + cd ../r2 | |
10 | + hg up |
|
9 | + hg up | |
11 | + echo abc |
|
10 | + echo abc | |
12 | + hg diff |
|
11 | + hg diff | |
13 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
|
12 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | |
14 | diff -r c19d34741b0a a |
|
13 | diff -r c19d34741b0a a | |
15 | --- a/a |
|
14 | --- a/a | |
16 | +++ b/a |
|
15 | +++ b/a | |
17 | @@ -1,1 +1,1 @@ |
|
16 | @@ -1,1 +1,1 @@ | |
18 | -a |
|
17 | -a | |
19 | +abc |
|
18 | +abc | |
20 | + cd ../r1 |
|
19 | + cd ../r1 | |
21 | + echo b |
|
20 | + echo b | |
22 | + echo a2 |
|
21 | + echo a2 | |
23 | + hg addremove |
|
22 | + hg addremove | |
24 | + hg commit -t 2 -u test -d '0 0' |
|
23 | + hg commit -t 2 -u test -d '0 0' | |
25 | + cd ../r2 |
|
24 | + cd ../r2 | |
26 | + hg -q pull ../r1 |
|
25 | + hg -q pull ../r1 | |
27 | + hg status |
|
26 | + hg status | |
28 | C a |
|
27 | C a | |
29 | + hg --debug up |
|
28 | + hg --debug up | |
30 | resolving manifests |
|
29 | resolving manifests | |
31 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
|
30 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e | |
32 | a versions differ, resolve |
|
31 | a versions differ, resolve | |
33 | remote created b |
|
32 | remote created b | |
34 | getting b |
|
33 | getting b | |
35 | merging a |
|
34 | merging a | |
36 | resolving a |
|
35 | resolving a | |
37 | file a: other d730145abbf9 ancestor b789fdd96dc2 |
|
36 | file a: other d730145abbf9 ancestor b789fdd96dc2 | |
38 | + hg --debug up -m |
|
37 | + hg --debug up -m | |
39 | resolving manifests |
|
38 | resolving manifests | |
40 | ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
|
39 | ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e | |
41 | + hg parents |
|
40 | + hg parents | |
42 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
|
41 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
43 | tag: tip |
|
42 | tag: tip | |
44 | user: test |
|
43 | user: test | |
45 | date: Thu Jan 1 00:00:00 1970 |
|
44 | date: Thu Jan 1 00:00:00 1970 | |
46 | summary: 2 |
|
45 | summary: 2 | |
47 |
|
46 | |||
48 | + hg -v history |
|
47 | + hg -v history | |
49 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
|
48 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
50 | tag: tip |
|
49 | tag: tip | |
51 | manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 |
|
50 | manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 | |
52 | user: test |
|
51 | user: test | |
53 | date: Thu Jan 1 00:00:00 1970 |
|
52 | date: Thu Jan 1 00:00:00 1970 | |
54 | files: a b |
|
53 | files: a b | |
55 | description: |
|
54 | description: | |
56 | 2 |
|
55 | 2 | |
57 |
|
56 | |||
58 |
|
57 | |||
59 |
|
58 | |||
60 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
59 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
61 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
60 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
62 | user: test |
|
61 | user: test | |
63 | date: Thu Jan 1 00:00:00 1970 |
|
62 | date: Thu Jan 1 00:00:00 1970 | |
64 | files: a |
|
63 | files: a | |
65 | description: |
|
64 | description: | |
66 | 1 |
|
65 | 1 | |
67 |
|
66 | |||
68 |
|
67 | |||
69 |
|
68 | |||
70 | + hg diff |
|
69 | + hg diff | |
71 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
|
70 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | |
72 | diff -r 1e71731e6fbb a |
|
71 | diff -r 1e71731e6fbb a | |
73 | --- a/a |
|
72 | --- a/a | |
74 | +++ b/a |
|
73 | +++ b/a | |
75 | @@ -1,1 +1,1 @@ |
|
74 | @@ -1,1 +1,1 @@ | |
76 | -a2 |
|
75 | -a2 | |
77 | +abc |
|
76 | +abc |
General Comments 0
You need to be logged in to leave comments.
Login now