Show More
@@ -1,47 +1,49 b'' | |||||
1 | + mkdir t |
|
1 | + mkdir t | |
2 | + cd t |
|
2 | + cd t | |
3 | + hg init |
|
3 | + hg init | |
4 | + echo This is file a1 |
|
4 | + echo This is file a1 | |
5 | + hg add a |
|
5 | + hg add a | |
6 | + hg commit -m 'commit #0' -d '0 0' |
|
6 | + hg commit -m 'commit #0' -d '0 0' | |
7 | + echo This is file b1 |
|
7 | + echo This is file b1 | |
8 | + hg add b |
|
8 | + hg add b | |
9 | + hg commit -m 'commit #1' -d '0 0' |
|
9 | + hg commit -m 'commit #1' -d '0 0' | |
10 | + rm b |
|
10 | + rm b | |
11 | + hg update 0 |
|
11 | + hg update 0 | |
12 | + echo This is file b2 |
|
12 | + echo This is file b2 | |
13 | + hg add b |
|
13 | + hg add b | |
14 | + hg commit -m 'commit #2' -d '0 0' |
|
14 | + hg commit -m 'commit #2' -d '0 0' | |
15 | + cd .. |
|
15 | + cd .. | |
16 | + /bin/rm -rf t |
|
16 | + /bin/rm -rf t | |
17 | + mkdir t |
|
17 | + mkdir t | |
18 | + cd t |
|
18 | + cd t | |
19 | + hg init |
|
19 | + hg init | |
20 | + echo This is file a1 |
|
20 | + echo This is file a1 | |
21 | + hg add a |
|
21 | + hg add a | |
22 | + hg commit -m 'commit #0' -d '0 0' |
|
22 | + hg commit -m 'commit #0' -d '0 0' | |
23 | + echo This is file b1 |
|
23 | + echo This is file b1 | |
24 | + hg add b |
|
24 | + hg add b | |
25 | + hg commit -m 'commit #1' -d '0 0' |
|
25 | + hg commit -m 'commit #1' -d '0 0' | |
26 | + rm b |
|
26 | + rm b | |
27 | + hg update 0 |
|
27 | + hg update 0 | |
28 | + echo This is file b2 |
|
28 | + echo This is file b2 | |
29 | + hg commit -A -m 'commit #2' -d '0 0' |
|
29 | + hg commit -A -m 'commit #2' -d '0 0' | |
|
30 | adding b | |||
30 | + cd .. |
|
31 | + cd .. | |
31 | + /bin/rm -rf t |
|
32 | + /bin/rm -rf t | |
32 | + mkdir t |
|
33 | + mkdir t | |
33 | + cd t |
|
34 | + cd t | |
34 | + hg init |
|
35 | + hg init | |
35 | + echo This is file a1 |
|
36 | + echo This is file a1 | |
36 | + hg add a |
|
37 | + hg add a | |
37 | + hg commit -m 'commit #0' -d '0 0' |
|
38 | + hg commit -m 'commit #0' -d '0 0' | |
38 | + echo This is file b1 |
|
39 | + echo This is file b1 | |
39 | + hg add b |
|
40 | + hg add b | |
40 | + hg commit -m 'commit #1' -d '0 0' |
|
41 | + hg commit -m 'commit #1' -d '0 0' | |
41 | + rm b |
|
42 | + rm b | |
42 | + hg remove b |
|
43 | + hg remove b | |
43 | + hg update 0 |
|
44 | + hg update 0 | |
44 | + echo This is file b2 |
|
45 | + echo This is file b2 | |
45 | + hg commit -A -m 'commit #2' -d '0 0' |
|
46 | + hg commit -A -m 'commit #2' -d '0 0' | |
|
47 | adding b | |||
46 | + cd .. |
|
48 | + cd .. | |
47 | + /bin/rm -rf t |
|
49 | + /bin/rm -rf t |
@@ -1,9 +1,10 b'' | |||||
1 | + hg init |
|
1 | + hg init | |
2 | + echo This is file a1 |
|
2 | + echo This is file a1 | |
3 | + hg add a |
|
3 | + hg add a | |
4 | + hg commit -m 'commit #0' -d '0 0' |
|
4 | + hg commit -m 'commit #0' -d '0 0' | |
5 | + touch b |
|
5 | + touch b | |
6 | + hg add b |
|
6 | + hg add b | |
7 | + rm b |
|
7 | + rm b | |
8 | + hg commit -A '-mcomment #1' -d '0 0' |
|
8 | + hg commit -A '-mcomment #1' -d '0 0' | |
|
9 | removing b | |||
9 | b never committed! |
|
10 | b never committed! |
@@ -1,19 +1,20 b'' | |||||
1 | + mkdir t |
|
1 | + mkdir t | |
2 | + cd t |
|
2 | + cd t | |
3 | + hg init |
|
3 | + hg init | |
4 | + echo This is file a1 |
|
4 | + echo This is file a1 | |
5 | + echo This is file b1 |
|
5 | + echo This is file b1 | |
6 | + hg add a b |
|
6 | + hg add a b | |
7 | + hg commit -m 'commit #0' -d '0 0' |
|
7 | + hg commit -m 'commit #0' -d '0 0' | |
8 | + echo This is file b22 |
|
8 | + echo This is file b22 | |
9 | + hg commit '-mcomment #1' -d '0 0' |
|
9 | + hg commit '-mcomment #1' -d '0 0' | |
10 | + hg update 0 |
|
10 | + hg update 0 | |
11 | + rm b |
|
11 | + rm b | |
12 | + hg commit -A '-mcomment #2' -d '0 0' |
|
12 | + hg commit -A '-mcomment #2' -d '0 0' | |
|
13 | removing b | |||
13 | + yes k |
|
14 | + yes k | |
14 | + hg update 1 |
|
15 | + hg update 1 | |
15 | this update spans a branch affecting the following files: |
|
16 | this update spans a branch affecting the following files: | |
16 | b |
|
17 | b | |
17 | aborting update spanning branches! |
|
18 | aborting update spanning branches! | |
18 | (use update -m to perform a branch merge) |
|
19 | (use update -m to perform a branch merge) | |
19 | + exit 0 |
|
20 | + exit 0 |
@@ -1,21 +1,22 b'' | |||||
|
1 | adding foo | |||
1 | checking changesets |
|
2 | checking changesets | |
2 | checking manifests |
|
3 | checking manifests | |
3 | crosschecking files in changesets and manifests |
|
4 | crosschecking files in changesets and manifests | |
4 | checking files |
|
5 | checking files | |
5 | 1 files, 1 changesets, 1 total revisions |
|
6 | 1 files, 1 changesets, 1 total revisions | |
6 | requesting all changes |
|
7 | requesting all changes | |
7 | adding changesets |
|
8 | adding changesets | |
8 | adding manifests |
|
9 | adding manifests | |
9 | adding file revisions |
|
10 | adding file revisions | |
10 | modified 1 files, added 1 changesets and 1 new revisions |
|
11 | modified 1 files, added 1 changesets and 1 new revisions | |
11 | checking changesets |
|
12 | checking changesets | |
12 | checking manifests |
|
13 | checking manifests | |
13 | crosschecking files in changesets and manifests |
|
14 | crosschecking files in changesets and manifests | |
14 | checking files |
|
15 | checking files | |
15 | 1 files, 1 changesets, 1 total revisions |
|
16 | 1 files, 1 changesets, 1 total revisions | |
16 | foo |
|
17 | foo | |
17 | 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
|
18 | 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo | |
18 | pulling from http://localhost:20059/ |
|
19 | pulling from http://localhost:20059/ | |
19 | searching for changes |
|
20 | searching for changes | |
20 | no changes found |
|
21 | no changes found | |
21 | killed! |
|
22 | killed! |
@@ -1,38 +1,39 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 | adding foo | |||
6 | + hg commit -m 1 |
|
7 | + hg commit -m 1 | |
7 | + hg verify |
|
8 | + hg verify | |
8 | checking changesets |
|
9 | checking changesets | |
9 | checking manifests |
|
10 | checking manifests | |
10 | crosschecking files in changesets and manifests |
|
11 | crosschecking files in changesets and manifests | |
11 | checking files |
|
12 | checking files | |
12 | 1 files, 1 changesets, 1 total revisions |
|
13 | 1 files, 1 changesets, 1 total revisions | |
13 | + hg clone . ../branch |
|
14 | + hg clone . ../branch | |
14 | + cd ../branch |
|
15 | + cd ../branch | |
15 | + hg co |
|
16 | + hg co | |
16 | + echo bar |
|
17 | + echo bar | |
17 | + hg commit -m 2 |
|
18 | + hg commit -m 2 | |
18 | + cd ../test |
|
19 | + cd ../test | |
19 | + hg pull ../branch |
|
20 | + hg pull ../branch | |
20 | pulling from ../branch |
|
21 | pulling from ../branch | |
21 | searching for changes |
|
22 | searching for changes | |
22 | adding changesets |
|
23 | adding changesets | |
23 | adding manifests |
|
24 | adding manifests | |
24 | adding file revisions |
|
25 | adding file revisions | |
25 | modified 1 files, added 1 changesets and 1 new revisions |
|
26 | modified 1 files, added 1 changesets and 1 new revisions | |
26 | (run 'hg update' to get a working copy) |
|
27 | (run 'hg update' to get a working copy) | |
27 | + hg verify |
|
28 | + hg verify | |
28 | checking changesets |
|
29 | checking changesets | |
29 | checking manifests |
|
30 | checking manifests | |
30 | crosschecking files in changesets and manifests |
|
31 | crosschecking files in changesets and manifests | |
31 | checking files |
|
32 | checking files | |
32 | 1 files, 2 changesets, 2 total revisions |
|
33 | 1 files, 2 changesets, 2 total revisions | |
33 | + hg co |
|
34 | + hg co | |
34 | + cat foo |
|
35 | + cat foo | |
35 | foo |
|
36 | foo | |
36 | bar |
|
37 | bar | |
37 | + hg manifest |
|
38 | + hg manifest | |
38 | 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo |
|
39 | 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo |
@@ -1,76 +1,72 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 | adding a | |||
6 | + hg commit -m 1 -d '0 0' |
|
7 | + hg commit -m 1 -d '0 0' | |
7 | + hg clone . ../r2 |
|
8 | + hg clone . ../r2 | |
8 | + cd ../r2 |
|
9 | + cd ../r2 | |
9 | + hg up |
|
10 | + hg up | |
10 | + echo abc |
|
11 | + echo abc | |
11 | + hg diff |
|
12 | + hg diff | |
12 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
|
13 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | |
13 | diff -r c19d34741b0a a |
|
14 | diff -r c19d34741b0a a | |
14 | --- a/a |
|
15 | --- a/a | |
15 | +++ b/a |
|
16 | +++ b/a | |
16 | @@ -1,1 +1,1 @@ |
|
17 | @@ -1,1 +1,1 @@ | |
17 | -a |
|
18 | -a | |
18 | +abc |
|
19 | +abc | |
19 | + cd ../r1 |
|
20 | + cd ../r1 | |
20 | + echo b |
|
21 | + echo b | |
21 | + echo a2 |
|
22 | + echo a2 | |
22 | + hg addremove |
|
23 | + hg addremove | |
|
24 | adding b | |||
23 | + hg commit -m 2 -d '0 0' |
|
25 | + hg commit -m 2 -d '0 0' | |
24 | + cd ../r2 |
|
26 | + cd ../r2 | |
25 | + hg -q pull ../r1 |
|
27 | + hg -q pull ../r1 | |
26 | + hg status |
|
28 | + hg status | |
27 | M a |
|
29 | M a | |
28 | + hg --debug up |
|
30 | + hg --debug up | |
29 | resolving manifests |
|
31 | resolving manifests | |
30 | force None allow None moddirstate True linear True |
|
32 | force None allow None moddirstate True linear True | |
31 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
|
33 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e | |
32 | a versions differ, resolve |
|
34 | a versions differ, resolve | |
33 | remote created b |
|
35 | remote created b | |
34 | getting b |
|
36 | getting b | |
35 | merging a |
|
37 | merging a | |
36 | resolving a |
|
38 | resolving a | |
37 | file a: other d730145abbf9 ancestor b789fdd96dc2 |
|
39 | file a: other d730145abbf9 ancestor b789fdd96dc2 | |
38 | + hg --debug up -m |
|
40 | + hg --debug up -m | |
39 | resolving manifests |
|
41 | resolving manifests | |
40 | force None allow 1 moddirstate True linear True |
|
42 | force None allow 1 moddirstate True linear True | |
41 | ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e |
|
43 | ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e | |
42 | + hg parents |
|
44 | + hg parents | |
43 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
|
45 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
44 | tag: tip |
|
46 | tag: tip | |
45 | user: test |
|
47 | user: test | |
46 | date: Thu Jan 1 00:00:00 1970 |
|
48 | date: Thu Jan 1 00:00:00 1970 | |
47 | summary: 2 |
|
49 | summary: 2 | |
48 |
|
50 | |||
49 | + hg -v history |
|
51 | + hg -v history | |
50 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 |
|
52 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
51 | tag: tip |
|
53 | tag: tip | |
52 | manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 |
|
54 | manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758 | |
53 | user: test |
|
55 | user: test | |
54 | date: Thu Jan 1 00:00:00 1970 |
|
56 | date: Thu Jan 1 00:00:00 1970 | |
55 | files: a b |
|
57 | files: a b | |
56 | description: |
|
58 | description: | |
57 | 2 |
|
59 | 2 | |
58 |
|
60 | |||
59 |
|
61 | |||
60 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
62 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
61 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
63 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
62 | user: test |
|
64 | user: test | |
63 | date: Thu Jan 1 00:00:00 1970 |
|
65 | date: Thu Jan 1 00:00:00 1970 | |
64 | files: a |
|
66 | files: a | |
65 | description: |
|
67 | description: | |
66 | 1 |
|
68 | 1 | |
67 |
|
69 | |||
68 |
|
70 | |||
69 | + hg diff |
|
71 | + hg diff | |
70 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
|
72 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' | |
71 | diff -r 1e71731e6fbb a |
|
|||
72 | --- a/a |
|
|||
73 | +++ b/a |
|
|||
74 | @@ -1,1 +1,1 @@ |
|
|||
75 | -a2 |
|
|||
76 | +abc |
|
General Comments 0
You need to be logged in to leave comments.
Login now