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