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