Show More
@@ -1,12 +1,8 b'' | |||
|
1 | 1 | + hg init |
|
2 | + echo This is file a1 | |
|
3 | 2 | + hg add a |
|
4 |
+ hg commit -m |
|
|
5 | + ls | |
|
3 | + hg commit -m commit #0 -d 0 0 | |
|
6 | 4 | a |
|
7 | + echo This is file b1 | |
|
8 | 5 | + hg add b |
|
9 |
+ hg commit -m |
|
|
6 | + hg commit -m commit #1 -d 0 0 | |
|
10 | 7 | + hg co 0 |
|
11 | + ls | |
|
12 | 8 | a |
@@ -1,15 +1,9 b'' | |||
|
1 | 1 | + hg clone http://localhost:20059/ copy |
|
2 | 2 | requesting all changes |
|
3 | 3 | abort: error: Connection refused |
|
4 | + echo 255 | |
|
5 | 4 | 255 |
|
6 | + ls copy | |
|
7 | 5 | ls: copy: No such file or directory |
|
8 | + cat | |
|
9 | + set +x | |
|
10 | 6 | + hg clone http://localhost:20059/foo copy2 |
|
11 | 7 | requesting all changes |
|
12 | 8 | abort: HTTP Error 404: File not found |
|
13 | + echo 255 | |
|
14 | 9 | 255 |
|
15 | + set +x |
@@ -1,9 +1,6 b'' | |||
|
1 | + mkdir t | |
|
2 | + cd t | |
|
3 | 1 | + hg init |
|
4 | + echo a | |
|
5 | 2 | + hg add a |
|
6 |
+ hg commit -m test -d |
|
|
3 | + hg commit -m test -d 0 0 | |
|
7 | 4 | + hg history |
|
8 | 5 | changeset: 0:acb14030fe0a |
|
9 | 6 | tag: tip |
@@ -1,39 +1,20 b'' | |||
|
1 | 1 | + hg clone a b |
|
2 | 2 | abort: repository a/.hg not found! |
|
3 | + echo 255 | |
|
4 | 3 | 255 |
|
5 | 4 | + hg clone http://127.0.0.1:3121/a b |
|
6 | 5 | requesting all changes |
|
7 | 6 | abort: error: Connection refused |
|
8 | + echo 255 | |
|
9 | 7 | 255 |
|
10 | + rm -rf b | |
|
11 | + mkdir a | |
|
12 | + chmod 000 a | |
|
13 | 8 | + hg clone a b |
|
14 | 9 | abort: repository a/.hg not found! |
|
15 | + echo 255 | |
|
16 | 10 | 255 |
|
17 | + mkdir b | |
|
18 | + cd b | |
|
19 | 11 | + hg init |
|
20 | 12 | + hg clone . ../a |
|
21 | 13 | abort: destination '../a' already exists |
|
22 | + echo 1 | |
|
23 | 14 | 1 |
|
24 | + cd .. | |
|
25 | + chmod 700 a | |
|
26 | + rm -rf a b | |
|
27 | + mkfifo a | |
|
28 | 15 | + hg clone a b |
|
29 | 16 | abort: repository a/.hg not found! |
|
30 | + echo 255 | |
|
31 | 17 | 255 |
|
32 | + rm a | |
|
33 | + mkdir q | |
|
34 | + cd q | |
|
35 | 18 | + hg init |
|
36 | + cd .. | |
|
37 | 19 | + hg clone q |
|
38 | 20 | abort: destination 'q' already exists |
|
39 | + true |
@@ -1,12 +1,7 b'' | |||
|
1 | + mkdir a | |
|
2 | + cd a | |
|
3 | 1 | + hg init |
|
4 | + echo a | |
|
5 | 2 | + hg add a |
|
6 |
+ hg commit -m test -d |
|
|
3 | + hg commit -m test -d 0 0 | |
|
7 | 4 | + hg clone . ../b |
|
8 | + cd ../b | |
|
9 | + cat a | |
|
10 | 5 | a |
|
11 | 6 | + hg verify |
|
12 | 7 | checking changesets |
@@ -15,8 +10,6 b' crosschecking files in changesets and ma' | |||
|
15 | 10 | checking files |
|
16 | 11 | 1 files, 1 changesets, 1 total revisions |
|
17 | 12 | + hg clone -U . ../c |
|
18 | + cd ../c | |
|
19 | + cat a | |
|
20 | 13 | cat: a: No such file or directory |
|
21 | 14 | + hg verify |
|
22 | 15 | checking changesets |
@@ -24,9 +17,6 b' checking manifests' | |||
|
24 | 17 | crosschecking files in changesets and manifests |
|
25 | 18 | checking files |
|
26 | 19 | 1 files, 1 changesets, 1 total revisions |
|
27 | + mkdir ../d | |
|
28 | + cd ../d | |
|
29 | 20 | + hg clone ../a |
|
30 | + cd a | |
|
31 | 21 | + hg cat a |
|
32 | 22 | a |
@@ -1,24 +1,17 b'' | |||
|
1 | 1 | + hg init |
|
2 | + echo nothing | |
|
3 | 2 | + hg add a |
|
4 |
+ hg commit -m ancestor -d |
|
|
5 | + echo something | |
|
6 | + hg commit -m branch1 -d '0 0' | |
|
3 | + hg commit -m ancestor -d 0 0 | |
|
4 | + hg commit -m branch1 -d 0 0 | |
|
7 | 5 | + hg co 0 |
|
8 | + echo 'something else' | |
|
9 | + hg commit -m branch2 -d '0 0' | |
|
10 | + export HGMERGE=merge | |
|
11 | + HGMERGE=merge | |
|
6 | + hg commit -m branch2 -d 0 0 | |
|
12 | 7 | + hg up -m 1 |
|
13 | 8 | merge: warning: conflicts during merge |
|
14 | 9 | merging a |
|
15 | 10 | merging a failed! |
|
16 | 11 | + hg id |
|
17 | 12 | 32e80765d7fe+75234512624c+ tip |
|
18 | + grep -Ev '>>>|<<<' a | |
|
19 | 13 | something else |
|
20 | 14 | ======= |
|
21 | 15 | something |
|
22 | 16 | + hg status |
|
23 | 17 | M a |
|
24 | ? .out |
@@ -1,15 +1,11 b'' | |||
|
1 | 1 | + hg init |
|
2 | + echo a | |
|
3 | 2 | + hg add a |
|
4 |
+ hg commit -m 1 -d |
|
|
3 | + hg commit -m 1 -d 0 0 | |
|
5 | 4 | + hg status |
|
6 | ? .out | |
|
7 | + cp a b | |
|
8 | 5 | + hg copy a b |
|
9 | 6 | + hg status |
|
10 | 7 | A b |
|
11 | ? .out | |
|
12 | + hg --debug commit -m 2 -d '0 0' | |
|
8 | + hg --debug commit -m 2 -d 0 0 | |
|
13 | 9 | b |
|
14 | 10 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
15 | 11 | + hg history |
@@ -30,19 +26,9 b' user: test' | |||
|
30 | 26 | date: Thu Jan 1 00:00:00 1970 |
|
31 | 27 | summary: 1 |
|
32 | 28 | |
|
33 | + hexdump -C .hg/data/b.d | |
|
34 | 00000000 75 01 0a 63 6f 70 79 72 65 76 3a 20 62 37 38 39 |u..copyrev: b789| | |
|
35 | 00000010 66 64 64 39 36 64 63 32 66 33 62 64 32 32 39 63 |fdd96dc2f3bd229c| | |
|
36 | 00000020 31 64 64 38 65 65 64 66 30 66 63 36 30 65 32 62 |1dd8eedf0fc60e2b| | |
|
37 | 00000030 36 38 65 33 0a 63 6f 70 79 3a 20 61 0a 01 0a 61 |68e3.copy: a...a| | |
|
38 | 00000040 0a |.| | |
|
39 | 00000041 | |
|
40 | + hg cat b | |
|
41 | + md5sum bsum | |
|
42 | 60b725f10c9c85c70d97880dfe8191b3 bsum | |
|
43 | + hg cat a | |
|
44 | + md5sum asum | |
|
45 | 60b725f10c9c85c70d97880dfe8191b3 asum | |
|
29 | 566e338d09a089ba737c21e0d3759980 .hg/data/b.d | |
|
30 | 3268d2f51b2d2d423ff01b59eb6fbb14 bsum | |
|
31 | 70909ca2ecf494c71e9184b445e040ee asum | |
|
46 | 32 | + hg verify |
|
47 | 33 | checking changesets |
|
48 | 34 | checking manifests |
@@ -1,8 +1,14 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg ci -m a -d 0 0 | |
|
4 | + hg add b | |
|
5 | + hg diff | |
|
1 | 6 | diff -r 3903775176ed b |
|
2 | 7 | --- /dev/null |
|
3 | 8 | +++ b/b |
|
4 | 9 | @@ -0,0 +1,1 @@ |
|
5 | 10 | +123 |
|
11 | + hg diff -r tip | |
|
6 | 12 | diff -r 3903775176ed b |
|
7 | 13 | --- /dev/null |
|
8 | 14 | +++ b/b |
@@ -1,3 +1,9 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m first -d 0 0 a | |
|
4 | + hg add sub/b | |
|
5 | + hg commit -m second -d 0 0 sub/b | |
|
1 | 6 | 321 |
|
7 | + hg co 0 | |
|
2 | 8 | cat: sub/b: No such file or directory |
|
3 | 9 | ls: sub: No such file or directory |
@@ -1,13 +1,6 b'' | |||
|
1 | + umask 027 | |
|
2 | + mkdir test1 | |
|
3 | + cd test1 | |
|
4 | 1 | + hg init |
|
5 | + touch a b | |
|
6 | 2 | + hg add a b |
|
7 |
+ hg ci -m |
|
|
8 | + cd .. | |
|
9 | + mkdir test2 | |
|
10 | + cd test2 | |
|
3 | + hg ci -m added a b -d 0 0 | |
|
11 | 4 | + hg init |
|
12 | 5 | + hg pull ../test1 |
|
13 | 6 | pulling from ../test1 |
@@ -18,11 +11,8 b' adding file changes' | |||
|
18 | 11 | added 1 changesets with 2 changes to 2 files |
|
19 | 12 | (run 'hg update' to get a working copy) |
|
20 | 13 | + hg co |
|
21 | + chmod +x a | |
|
22 |
+ hg ci -m |
|
|
23 | + cd ../test1 | |
|
24 | + echo 123 | |
|
25 | + hg ci -m 'a updated' -d '0 0' | |
|
14 | + hg ci -m chmod +x a -d 0 0 | |
|
15 | + hg ci -m a updated -d 0 0 | |
|
26 | 16 | + hg pull ../test2 |
|
27 | 17 | pulling from ../test2 |
|
28 | 18 | searching for changes |
@@ -66,7 +56,5 b' summary: added a b' | |||
|
66 | 56 | resolving manifests |
|
67 | 57 | merging a |
|
68 | 58 | resolving a |
|
69 | + ls -l ../test1/a ../test2/a | |
|
70 | + cut -b 0-10 | |
|
71 | 59 | -rwxr-x--- |
|
72 | 60 | -rwxr-x--- |
@@ -1,3 +1,4 b'' | |||
|
1 | + hg help | |
|
1 | 2 | basic hg commands (use "hg help -v" for more): |
|
2 | 3 | |
|
3 | 4 | add add the specified files on the next commit |
@@ -15,6 +16,7 b' basic hg commands (use "hg help -v" for ' | |||
|
15 | 16 | serve export the repository via HTTP |
|
16 | 17 | status show changed files in the working directory |
|
17 | 18 | update update or merge working directory |
|
19 | + hg -q help | |
|
18 | 20 | basic hg commands (use "hg help -v" for more): |
|
19 | 21 | |
|
20 | 22 | add add the specified files on the next commit |
@@ -32,6 +34,7 b' basic hg commands (use "hg help -v" for ' | |||
|
32 | 34 | serve export the repository via HTTP |
|
33 | 35 | status show changed files in the working directory |
|
34 | 36 | update update or merge working directory |
|
37 | + hg add -h | |
|
35 | 38 | hg add: option -h not recognized |
|
36 | 39 | hg add [FILE]... |
|
37 | 40 | |
@@ -41,6 +44,7 b' hg add [FILE]...' | |||
|
41 | 44 | exclude path from search |
|
42 | 45 | |
|
43 | 46 | add the specified files on the next commit |
|
47 | + hg add --skjdfks | |
|
44 | 48 | hg add: option --skjdfks not recognized |
|
45 | 49 | hg add [FILE]... |
|
46 | 50 | |
@@ -50,6 +54,7 b' hg add [FILE]...' | |||
|
50 | 54 | exclude path from search |
|
51 | 55 | |
|
52 | 56 | add the specified files on the next commit |
|
57 | + hg help diff | |
|
53 | 58 | hg diff [-r REV1 [-r REV2]] [FILE]... |
|
54 | 59 | |
|
55 | 60 | -r --rev |
@@ -60,7 +65,9 b' hg diff [-r REV1 [-r REV2]] [FILE]...' | |||
|
60 | 65 | exclude path from search |
|
61 | 66 | |
|
62 | 67 | diff working directory (or selected files) |
|
68 | + hg help foo | |
|
63 | 69 | hg: unknown command foo |
|
70 | + hg -q commands | |
|
64 | 71 | hg: unknown command 'commands' |
|
65 | 72 | basic hg commands (use "hg help -v" for more): |
|
66 | 73 |
@@ -1,9 +1,5 b'' | |||
|
1 | 1 | + hg init |
|
2 | + echo '[hooks]' | |
|
3 | + echo 'precommit = echo precommit hook' | |
|
4 | + echo 'commit = echo commit hook: $NODE' | |
|
5 | + echo a | |
|
6 | 2 | + hg add a |
|
7 |
+ hg commit -m test -d |
|
|
3 | + hg commit -m test -d 0 0 | |
|
8 | 4 | precommit hook |
|
9 | 5 | commit hook: acb14030fe0a21b60322c440ad2d20cf7685a376 |
@@ -1,12 +1,7 b'' | |||
|
1 | + mkdir t | |
|
2 | + cd t | |
|
3 | 1 | + hg init |
|
4 | + echo 'added file1' | |
|
5 | + echo 'added file2' | |
|
6 | 2 | + hg add file1 file2 |
|
7 |
+ hg commit -m |
|
|
8 | + echo 'changed file1' | |
|
9 | + hg commit -m 'changed file1' -d '0 0' -u user | |
|
3 | + hg commit -m added file1 and file2 -d 0 0 -u user | |
|
4 | + hg commit -m changed file1 -d 0 0 -u user | |
|
10 | 5 | + hg -q log |
|
11 | 6 | 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c |
|
12 | 7 | 0:8633637036c18f021d771208e16ae3508ab81d28 |
@@ -15,7 +10,6 b' 3aa14bbc23d9 tip' | |||
|
15 | 10 | + hg update -C 0 |
|
16 | 11 | + hg id |
|
17 | 12 | 8633637036c1 |
|
18 | + echo 'changed file1' | |
|
19 | 13 | + hg id |
|
20 | 14 | 8633637036c1+ |
|
21 | 15 | + hg revert |
@@ -29,8 +23,6 b' 8633637036c1' | |||
|
29 | 23 | + hg id |
|
30 | 24 | 3aa14bbc23d9 tip |
|
31 | 25 | + hg update -C 0 |
|
32 | + echo 'changed file1' | |
|
33 | + HGMERGE=merge | |
|
34 | 26 | + hg update |
|
35 | 27 | merging file1 |
|
36 | 28 | + hg diff |
@@ -52,5 +44,3 b' 3aa14bbc23d9 tip' | |||
|
52 | 44 | + hg status |
|
53 | 45 | + hg id |
|
54 | 46 | 3aa14bbc23d9 tip |
|
55 | + cd .. | |
|
56 | + /bin/rm -rf t |
@@ -1,12 +1,7 b'' | |||
|
1 | + mkdir t | |
|
2 | + cd t | |
|
3 | 1 | + hg init |
|
4 | + echo 'added file1' | |
|
5 | + echo 'added file2' | |
|
6 | 2 | + hg add file1 file2 |
|
7 |
+ hg commit -m |
|
|
8 | + echo 'changed file1' | |
|
9 | + hg commit -m 'changed file1' -d '0 0' -u user | |
|
3 | + hg commit -m added file1 and file2 -d 0 0 -u user | |
|
4 | + hg commit -m changed file1 -d 0 0 -u user | |
|
10 | 5 | + hg -q log |
|
11 | 6 | 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c |
|
12 | 7 | 0:8633637036c18f021d771208e16ae3508ab81d28 |
@@ -15,7 +10,6 b' 3aa14bbc23d9 tip' | |||
|
15 | 10 | + hg update -C 0 |
|
16 | 11 | + hg id |
|
17 | 12 | 8633637036c1 |
|
18 | + echo 'changed file1' | |
|
19 | 13 | + hg id |
|
20 | 14 | 8633637036c1+ |
|
21 | 15 | + hg revert |
@@ -29,14 +23,11 b' 8633637036c1' | |||
|
29 | 23 | + hg id |
|
30 | 24 | 3aa14bbc23d9 tip |
|
31 | 25 | + hg update -C 0 |
|
32 | + echo 'changed file1 different' | |
|
33 | + HGMERGE=merge | |
|
34 | 26 | + hg update |
|
35 | 27 | merge: warning: conflicts during merge |
|
36 | 28 | merging file1 |
|
37 | 29 | merging file1 failed! |
|
38 | 30 | + hg diff |
|
39 | + sed -e 's/\(\(---\|+++\).*\)\t.*/\1/' -e 's/\(<<<<<<<\|>>>>>>>\) .*/\1/' | |
|
40 | 31 | diff -r 3aa14bbc23d9 file1 |
|
41 | 32 | --- a/file1 |
|
42 | 33 | +++ b/file1 |
@@ -66,5 +57,3 b' 3aa14bbc23d9 tip' | |||
|
66 | 57 | + hg status |
|
67 | 58 | + hg id |
|
68 | 59 | 3aa14bbc23d9 tip |
|
69 | + cd .. | |
|
70 | + /bin/rm -rf t |
@@ -1,82 +1,45 b'' | |||
|
1 | + cat | |
|
2 | + chmod +x merge | |
|
3 | + mkdir t | |
|
4 | + cd t | |
|
5 | 1 | + hg init |
|
6 | + echo This is file a1 | |
|
7 | 2 | + hg add a |
|
8 |
+ hg commit -m |
|
|
9 | + echo This is file b1 | |
|
3 | + hg commit -m commit #0 -d 0 0 | |
|
10 | 4 | + hg add b |
|
11 |
+ hg commit -m |
|
|
5 | + hg commit -m commit #1 -d 0 0 | |
|
12 | 6 | + hg update 0 |
|
13 | + echo This is file c1 | |
|
14 | 7 | + hg add c |
|
15 |
+ hg commit -m |
|
|
16 | + echo This is file b1 | |
|
17 | + env HGMERGE=../merge hg update -m 1 | |
|
18 | + cd .. | |
|
19 | + /bin/rm -rf t | |
|
20 | + mkdir t | |
|
21 | + cd t | |
|
8 | + hg commit -m commit #2 -d 0 0 | |
|
9 | + hg update -m 1 | |
|
22 | 10 | + hg init |
|
23 | + echo This is file a1 | |
|
24 | 11 | + hg add a |
|
25 |
+ hg commit -m |
|
|
26 | + echo This is file b1 | |
|
12 | + hg commit -m commit #0 -d 0 0 | |
|
27 | 13 | + hg add b |
|
28 |
+ hg commit -m |
|
|
14 | + hg commit -m commit #1 -d 0 0 | |
|
29 | 15 | + hg update 0 |
|
30 | + echo This is file c1 | |
|
31 | 16 | + hg add c |
|
32 |
+ hg commit -m |
|
|
33 | + echo This is file b2 | |
|
34 | + env HGMERGE=../merge hg update -m 1 | |
|
17 | + hg commit -m commit #2 -d 0 0 | |
|
18 | + hg update -m 1 | |
|
35 | 19 | merging for b |
|
36 | 20 | merging b |
|
37 | + cd .. | |
|
38 | + /bin/rm -rf t | |
|
39 | + mkdir t | |
|
40 | + cd t | |
|
41 | 21 | + hg init |
|
42 | + echo This is file a1 | |
|
43 | 22 | + hg add a |
|
44 |
+ hg commit -m |
|
|
45 | + echo This is file b1 | |
|
23 | + hg commit -m commit #0 -d 0 0 | |
|
46 | 24 | + hg add b |
|
47 |
+ hg commit -m |
|
|
48 | + echo This is file b22 | |
|
49 | + hg commit -m 'commit #2' -d '0 0' | |
|
25 | + hg commit -m commit #1 -d 0 0 | |
|
26 | + hg commit -m commit #2 -d 0 0 | |
|
50 | 27 | + hg update 1 |
|
51 | + echo This is file c1 | |
|
52 | 28 | + hg add c |
|
53 |
+ hg commit -m |
|
|
54 | + cat b | |
|
29 | + hg commit -m commit #3 -d 0 0 | |
|
55 | 30 | This is file b1 |
|
56 | + echo This is file b22 | |
|
57 | + env HGMERGE=../merge hg update -m 2 | |
|
31 | + hg update -m 2 | |
|
58 | 32 | merging for b |
|
59 | 33 | merging b |
|
60 | + cd .. | |
|
61 | + /bin/rm -rf t | |
|
62 | + mkdir t | |
|
63 | + cd t | |
|
64 | 34 | + hg init |
|
65 | + echo This is file a1 | |
|
66 | 35 | + hg add a |
|
67 |
+ hg commit -m |
|
|
68 | + echo This is file b1 | |
|
36 | + hg commit -m commit #0 -d 0 0 | |
|
69 | 37 | + hg add b |
|
70 |
+ hg commit -m |
|
|
71 | + echo This is file b22 | |
|
72 | + hg commit -m 'commit #2' -d '0 0' | |
|
38 | + hg commit -m commit #1 -d 0 0 | |
|
39 | + hg commit -m commit #2 -d 0 0 | |
|
73 | 40 | + hg update 1 |
|
74 | + echo This is file c1 | |
|
75 | 41 | + hg add c |
|
76 |
+ hg commit -m |
|
|
77 | + echo This is file b33 | |
|
78 | + env HGMERGE=../merge hg update -m 2 | |
|
42 | + hg commit -m commit #3 -d 0 0 | |
|
43 | + hg update -m 2 | |
|
79 | 44 | merging for b |
|
80 | 45 | merging b |
|
81 | + cd .. | |
|
82 | + /bin/rm -rf t |
@@ -1,49 +1,25 b'' | |||
|
1 | + mkdir t | |
|
2 | + cd t | |
|
3 | 1 | + hg init |
|
4 | + echo This is file a1 | |
|
5 | 2 | + hg add a |
|
6 |
+ hg commit -m |
|
|
7 | + echo This is file b1 | |
|
3 | + hg commit -m commit #0 -d 0 0 | |
|
8 | 4 | + hg add b |
|
9 |
+ hg commit -m |
|
|
10 | + rm b | |
|
5 | + hg commit -m commit #1 -d 0 0 | |
|
11 | 6 | + hg update 0 |
|
12 | + echo This is file b2 | |
|
13 | 7 | + hg add b |
|
14 |
+ hg commit -m |
|
|
15 | + cd .. | |
|
16 | + /bin/rm -rf t | |
|
17 | + mkdir t | |
|
18 | + cd t | |
|
8 | + hg commit -m commit #2 -d 0 0 | |
|
19 | 9 | + hg init |
|
20 | + echo This is file a1 | |
|
21 | 10 | + hg add a |
|
22 |
+ hg commit -m |
|
|
23 | + echo This is file b1 | |
|
11 | + hg commit -m commit #0 -d 0 0 | |
|
24 | 12 | + hg add b |
|
25 |
+ hg commit -m |
|
|
26 | + rm b | |
|
13 | + hg commit -m commit #1 -d 0 0 | |
|
27 | 14 | + hg update 0 |
|
28 | + echo This is file b2 | |
|
29 | + hg commit -A -m 'commit #2' -d '0 0' | |
|
15 | + hg commit -A -m commit #2 -d 0 0 | |
|
30 | 16 | adding b |
|
31 | + cd .. | |
|
32 | + /bin/rm -rf t | |
|
33 | + mkdir t | |
|
34 | + cd t | |
|
35 | 17 | + hg init |
|
36 | + echo This is file a1 | |
|
37 | 18 | + hg add a |
|
38 |
+ hg commit -m |
|
|
39 | + echo This is file b1 | |
|
19 | + hg commit -m commit #0 -d 0 0 | |
|
40 | 20 | + hg add b |
|
41 |
+ hg commit -m |
|
|
42 | + rm b | |
|
21 | + hg commit -m commit #1 -d 0 0 | |
|
43 | 22 | + hg remove b |
|
44 | 23 | + hg update 0 |
|
45 | + echo This is file b2 | |
|
46 | + hg commit -A -m 'commit #2' -d '0 0' | |
|
24 | + hg commit -A -m commit #2 -d 0 0 | |
|
47 | 25 | adding b |
|
48 | + cd .. | |
|
49 | + /bin/rm -rf t |
@@ -1,11 +1,8 b'' | |||
|
1 | 1 | + hg init |
|
2 | + echo This is file a1 | |
|
3 | 2 | + hg add a |
|
4 |
+ hg commit -m |
|
|
5 | + touch b | |
|
3 | + hg commit -m commit #0 -d 0 0 | |
|
6 | 4 | + hg add b |
|
7 | + rm b | |
|
8 | + hg commit -A '-mcomment #1' -d '0 0' | |
|
9 | adding .out | |
|
5 | + hg commit -A -mcomment #1 -d 0 0 | |
|
10 | 6 | removing b |
|
11 | 7 | b never committed! |
|
8 | nothing changed |
@@ -1,15 +1,10 b'' | |||
|
1 | 1 | + hg init |
|
2 | + echo This is file a1 | |
|
3 | 2 | + hg add a |
|
4 |
+ hg commit -m |
|
|
5 | + echo This is file b1 | |
|
3 | + hg commit -m commit #0 -d 0 0 | |
|
6 | 4 | + hg add b |
|
7 |
+ hg commit -m |
|
|
5 | + hg commit -m commit #1 -d 0 0 | |
|
8 | 6 | + hg update 0 |
|
9 | + echo This is file c1 | |
|
10 | 7 | + hg add c |
|
11 |
+ hg commit -m |
|
|
8 | + hg commit -m commit #2 -d 0 0 | |
|
12 | 9 | + hg update -m 1 |
|
13 | + rm b | |
|
14 | + echo This is file c22 | |
|
15 | + hg commit -m 'commit #3' -d '0 0' | |
|
10 | + hg commit -m commit #3 -d 0 0 |
@@ -1,20 +1,12 b'' | |||
|
1 | + mkdir t | |
|
2 | + cd t | |
|
3 | 1 | + hg init |
|
4 | + echo This is file a1 | |
|
5 | + echo This is file b1 | |
|
6 | 2 | + hg add a b |
|
7 |
+ hg commit -m |
|
|
8 | + echo This is file b22 | |
|
9 | + hg commit '-mcomment #1' -d '0 0' | |
|
3 | + hg commit -m commit #0 -d 0 0 | |
|
4 | + hg commit -mcomment #1 -d 0 0 | |
|
10 | 5 | + hg update 0 |
|
11 | + rm b | |
|
12 | + hg commit -A '-mcomment #2' -d '0 0' | |
|
6 | + hg commit -A -mcomment #2 -d 0 0 | |
|
13 | 7 | removing b |
|
14 | + yes k | |
|
15 | 8 | + hg update 1 |
|
16 | 9 | this update spans a branch affecting the following files: |
|
17 | 10 | b |
|
18 | 11 | aborting update spanning branches! |
|
19 | 12 | (use update -m to perform a branch merge) |
|
20 | + exit 0 |
@@ -1,27 +1,12 b'' | |||
|
1 | + cat | |
|
2 | + chmod +x merge | |
|
3 | + export HGMERGE=./merge | |
|
4 | + HGMERGE=./merge | |
|
5 | + mkdir A1 | |
|
6 | + cd A1 | |
|
7 | 1 | + hg init |
|
8 | + echo This is file foo1 | |
|
9 | + echo This is file bar1 | |
|
10 | 2 | + hg add foo bar |
|
11 |
+ hg commit -m |
|
|
12 | + cd .. | |
|
3 | + hg commit -m commit text -d 0 0 | |
|
13 | 4 | + hg clone A1 B1 |
|
14 | + cd A1 | |
|
15 | + rm bar | |
|
16 | 5 | + hg remove bar |
|
17 |
+ hg commit -m |
|
|
18 | + cd ../B1 | |
|
19 | + echo This is file foo22 | |
|
20 | + hg commit -m 'commit test' -d '0 0' | |
|
21 | + cd .. | |
|
6 | + hg commit -m commit test -d 0 0 | |
|
7 | + hg commit -m commit test -d 0 0 | |
|
22 | 8 | + hg clone A1 A2 |
|
23 | 9 | + hg clone B1 B2 |
|
24 | + cd A1 | |
|
25 | 10 | + hg pull ../B1 |
|
26 | 11 | pulling from ../B1 |
|
27 | 12 | searching for changes |
@@ -31,12 +16,10 b' adding file changes' | |||
|
31 | 16 | added 1 changesets with 1 changes to 1 files |
|
32 | 17 | (run 'hg update' to get a working copy) |
|
33 | 18 | + hg update -m |
|
34 |
+ hg commit -m |
|
|
35 | + echo bar should remain deleted. | |
|
19 | + hg commit -m commit test -d 0 0 | |
|
36 | 20 | bar should remain deleted. |
|
37 | 21 | + hg manifest |
|
38 | 22 | 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |
|
39 | + cd ../B2 | |
|
40 | 23 | + hg pull ../A2 |
|
41 | 24 | pulling from ../A2 |
|
42 | 25 | searching for changes |
@@ -46,8 +29,7 b' adding file changes' | |||
|
46 | 29 | added 1 changesets with 0 changes to 0 files |
|
47 | 30 | (run 'hg update' to get a working copy) |
|
48 | 31 | + hg update -m |
|
49 |
+ hg commit -m |
|
|
50 | + echo bar should remain deleted. | |
|
32 | + hg commit -m commit test -d 0 0 | |
|
51 | 33 | bar should remain deleted. |
|
52 | 34 | + hg manifest |
|
53 | 35 | 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo |
@@ -1,21 +1,30 b'' | |||
|
1 | + hg init | |
|
2 | + hg addremove | |
|
1 | 3 | adding foo |
|
4 | + hg commit -m 1 | |
|
5 | + hg verify | |
|
2 | 6 | checking changesets |
|
3 | 7 | checking manifests |
|
4 | 8 | crosschecking files in changesets and manifests |
|
5 | 9 | checking files |
|
6 | 10 | 1 files, 1 changesets, 1 total revisions |
|
11 | + hg clone http://localhost:20059/ copy | |
|
7 | 12 | requesting all changes |
|
8 | 13 | adding changesets |
|
9 | 14 | adding manifests |
|
10 | 15 | adding file changes |
|
11 | 16 | added 1 changesets with 1 changes to 1 files |
|
17 | + hg verify | |
|
12 | 18 | checking changesets |
|
13 | 19 | checking manifests |
|
14 | 20 | crosschecking files in changesets and manifests |
|
15 | 21 | checking files |
|
16 | 22 | 1 files, 1 changesets, 1 total revisions |
|
23 | + hg co | |
|
17 | 24 | foo |
|
25 | + hg manifest | |
|
18 | 26 | 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
|
27 | + hg pull | |
|
19 | 28 | pulling from http://localhost:20059/ |
|
20 | 29 | searching for changes |
|
21 | 30 | no changes found |
@@ -1,15 +1,12 b'' | |||
|
1 | 1 | + hg --debug init |
|
2 | + echo this is a1 | |
|
3 | 2 | + hg add a |
|
4 |
+ hg commit -m0 -d |
|
|
5 | + echo this is b1 | |
|
3 | + hg commit -m0 -d 0 0 | |
|
6 | 4 | + hg add b |
|
7 |
+ hg commit -m1 -d |
|
|
5 | + hg commit -m1 -d 0 0 | |
|
8 | 6 | + hg manifest 1 |
|
9 | 7 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
10 | 8 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
|
11 | + echo this is c1 | |
|
12 | + hg rawcommit -p 1 -d '0 0' -m2 c | |
|
9 | + hg rawcommit -p 1 -d 0 0 -m2 c | |
|
13 | 10 | + hg manifest 2 |
|
14 | 11 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
15 | 12 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
@@ -21,8 +18,7 b' user: test' | |||
|
21 | 18 | date: Thu Jan 1 00:00:00 1970 |
|
22 | 19 | summary: 2 |
|
23 | 20 | |
|
24 | + rm b | |
|
25 | + hg rawcommit -p 2 -d '0 0' -m3 b | |
|
21 | + hg rawcommit -p 2 -d 0 0 -m3 b | |
|
26 | 22 | + hg manifest 3 |
|
27 | 23 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
28 | 24 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
@@ -33,8 +29,7 b' user: test' | |||
|
33 | 29 | date: Thu Jan 1 00:00:00 1970 |
|
34 | 30 | summary: 3 |
|
35 | 31 | |
|
36 | + echo this is a22 | |
|
37 | + hg rawcommit -p 3 -d '0 0' -m4 a | |
|
32 | + hg rawcommit -p 3 -d 0 0 -m4 a | |
|
38 | 33 | + hg manifest 4 |
|
39 | 34 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
40 | 35 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
@@ -45,8 +40,7 b' user: test' | |||
|
45 | 40 | date: Thu Jan 1 00:00:00 1970 |
|
46 | 41 | summary: 4 |
|
47 | 42 | |
|
48 | + echo this is c22 | |
|
49 | + hg rawcommit -p 1 -d '0 0' -m5 c | |
|
43 | + hg rawcommit -p 1 -d 0 0 -m5 c | |
|
50 | 44 | + hg manifest 5 |
|
51 | 45 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
52 | 46 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
@@ -57,7 +51,7 b' user: test' | |||
|
57 | 51 | date: Thu Jan 1 00:00:00 1970 |
|
58 | 52 | summary: 4 |
|
59 | 53 | |
|
60 |
+ hg rawcommit -p 4 -p 5 -d |
|
|
54 | + hg rawcommit -p 4 -p 5 -d 0 0 -m6 | |
|
61 | 55 | + hg manifest 6 |
|
62 | 56 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
63 | 57 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
@@ -70,7 +64,7 b' user: test' | |||
|
70 | 64 | date: Thu Jan 1 00:00:00 1970 |
|
71 | 65 | summary: 6 |
|
72 | 66 | |
|
73 |
+ hg rawcommit -p 6 -d |
|
|
67 | + hg rawcommit -p 6 -d 0 0 -m7 | |
|
74 | 68 | + hg manifest 7 |
|
75 | 69 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
76 | 70 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
@@ -1,6 +1,3 b'' | |||
|
1 | + mkdir test | |
|
2 | + cd test | |
|
3 | + echo foo | |
|
4 | 1 | + hg init |
|
5 | 2 | + hg addremove |
|
6 | 3 | adding foo |
@@ -12,11 +9,8 b' crosschecking files in changesets and ma' | |||
|
12 | 9 | checking files |
|
13 | 10 | 1 files, 1 changesets, 1 total revisions |
|
14 | 11 | + hg clone . ../branch |
|
15 | + cd ../branch | |
|
16 | 12 | + hg co |
|
17 | + echo bar | |
|
18 | 13 | + hg commit -m 2 |
|
19 | + cd ../test | |
|
20 | 14 | + hg pull ../branch |
|
21 | 15 | pulling from ../branch |
|
22 | 16 | searching for changes |
@@ -32,7 +26,6 b' crosschecking files in changesets and ma' | |||
|
32 | 26 | checking files |
|
33 | 27 | 1 files, 2 changesets, 2 total revisions |
|
34 | 28 | + hg co |
|
35 | + cat foo | |
|
36 | 29 | foo |
|
37 | 30 | bar |
|
38 | 31 | + hg manifest |
@@ -1,7 +1,6 b'' | |||
|
1 | 1 | + hg init |
|
2 | + echo a | |
|
3 | 2 | + hg add a |
|
4 |
+ hg commit -m test -d |
|
|
3 | + hg commit -m test -d 0 0 | |
|
5 | 4 | + hg history |
|
6 | 5 | changeset: 0:acb14030fe0a |
|
7 | 6 | tag: tip |
@@ -9,7 +8,7 b' user: test' | |||
|
9 | 8 | date: Thu Jan 1 00:00:00 1970 |
|
10 | 9 | summary: test |
|
11 | 10 | |
|
12 |
+ hg tag -d |
|
|
11 | + hg tag -d 0 0 bleah | |
|
13 | 12 | + hg history |
|
14 | 13 | changeset: 1:863197ef0378 |
|
15 | 14 | tag: tip |
@@ -23,9 +22,7 b' user: test' | |||
|
23 | 22 | date: Thu Jan 1 00:00:00 1970 |
|
24 | 23 | summary: test |
|
25 | 24 | |
|
26 | + echo foo | |
|
27 | + hg tag -d '0 0' bleah2 | |
|
25 | + hg tag -d 0 0 bleah2 | |
|
28 | 26 | abort: working copy of .hgtags is changed! |
|
29 | 27 | (please commit .hgtags manually) |
|
30 | + echo failed | |
|
31 | 28 | failed |
@@ -1,32 +1,25 b'' | |||
|
1 | + mkdir t | |
|
2 | + cd t | |
|
3 | 1 | + hg init |
|
4 | 2 | + hg id |
|
5 | 3 | unknown |
|
6 | + echo a | |
|
7 | 4 | + hg add a |
|
8 |
+ hg commit -m test -d |
|
|
5 | + hg commit -m test -d 0 0 | |
|
9 | 6 | + hg co |
|
10 | 7 | + hg identify |
|
11 | 8 | acb14030fe0a tip |
|
12 |
|
|
|
13 | ++ cut -d : -f 2 | |
|
14 | + T=acb14030fe0a21b60322c440ad2d20cf7685a376 | |
|
15 | + echo 'acb14030fe0a21b60322c440ad2d20cf7685a376 first' | |
|
16 | + cat .hgtags | |
|
9 | + hg -q tip | |
|
17 | 10 | acb14030fe0a21b60322c440ad2d20cf7685a376 first |
|
18 | 11 | + hg add .hgtags |
|
19 |
+ hg commit -m |
|
|
12 | + hg commit -m add tags -d 0 0 | |
|
20 | 13 | + hg tags |
|
21 |
tip 1:b |
|
|
14 | tip 1:b53d0e1f3043ecbccf1b9ad2cea562c1b50462b2 | |
|
22 | 15 | first 0:acb14030fe0a21b60322c440ad2d20cf7685a376 |
|
16 | hg -q tip ?:? | |
|
23 | 17 | + hg identify |
|
24 | b9154636be93 tip | |
|
25 | + echo bb | |
|
18 | b53d0e1f3043 tip | |
|
26 | 19 | + hg status |
|
27 | 20 | M a |
|
28 | 21 | + hg identify |
|
29 | b9154636be93+ tip | |
|
22 | b53d0e1f3043+ tip | |
|
30 | 23 | + hg co first |
|
31 | 24 | + hg id |
|
32 | 25 | acb14030fe0a+ first |
@@ -34,14 +27,13 b' acb14030fe0a+ first' | |||
|
34 | 27 | acb14030fe0a21b60322c440ad2d20cf7685a376+ first |
|
35 | 28 | + hg status |
|
36 | 29 | M a |
|
37 | + echo 1 | |
|
38 | 30 | + hg add b |
|
39 |
+ hg commit -m branch -d |
|
|
31 | + hg commit -m branch -d 0 0 | |
|
40 | 32 | + hg id |
|
41 | 33 | c8edf04160c7 tip |
|
42 | 34 | + hg co -m 1 |
|
43 | 35 | + hg id |
|
44 |
c8edf04160c7+b |
|
|
36 | c8edf04160c7+b53d0e1f3043+ tip | |
|
45 | 37 | + hg status |
|
46 | 38 | M .hgtags |
|
47 | 39 | M a |
@@ -1,9 +1,6 b'' | |||
|
1 | + mkdir t | |
|
2 | + cd t | |
|
3 | 1 | + hg init |
|
4 | + echo a | |
|
5 | 2 | + hg add a |
|
6 |
+ hg commit -m test -d |
|
|
3 | + hg commit -m test -d 0 0 | |
|
7 | 4 | + hg verify |
|
8 | 5 | checking changesets |
|
9 | 6 | checking manifests |
@@ -1,3 +1,10 b'' | |||
|
1 | + hg init | |
|
2 | + hg add a | |
|
3 | + hg commit -m a -u a -d 0 0 | |
|
4 | + hg init | |
|
5 | + hg add b | |
|
6 | + hg commit -m b -u b -d 0 0 | |
|
7 | + hg pull ../a | |
|
1 | 8 | pulling from ../a |
|
2 | 9 | searching for changes |
|
3 | 10 | warning: pulling from an unrelated repository! |
@@ -6,6 +13,7 b' adding manifests' | |||
|
6 | 13 | adding file changes |
|
7 | 14 | added 1 changesets with 1 changes to 1 files |
|
8 | 15 | (run 'hg update' to get a working copy) |
|
16 | + hg heads | |
|
9 | 17 | changeset: 1:9a79c33a9db3 |
|
10 | 18 | tag: tip |
|
11 | 19 | user: a |
@@ -1,29 +1,19 b'' | |||
|
1 | + mkdir r1 | |
|
2 | + cd r1 | |
|
3 | 1 | + hg init |
|
4 | + echo a | |
|
5 | 2 | + hg addremove |
|
6 | 3 | adding a |
|
7 |
+ hg commit -m 1 -d |
|
|
4 | + hg commit -m 1 -d 0 0 | |
|
8 | 5 | + hg clone . ../r2 |
|
9 | + cd ../r2 | |
|
10 | 6 | + hg up |
|
11 | + echo abc | |
|
12 | 7 | + hg diff |
|
13 | + sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/' | |
|
14 | 8 | diff -r c19d34741b0a a |
|
15 | 9 | --- a/a |
|
16 | 10 | +++ b/a |
|
17 | 11 | @@ -1,1 +1,1 @@ |
|
18 | 12 | -a |
|
19 | 13 | +abc |
|
20 | + cd ../r1 | |
|
21 | + echo b | |
|
22 | + echo a2 | |
|
23 | 14 | + hg addremove |
|
24 | 15 | adding b |
|
25 |
+ hg commit -m 2 -d |
|
|
26 | + cd ../r2 | |
|
16 | + hg commit -m 2 -d 0 0 | |
|
27 | 17 | + hg -q pull ../r1 |
|
28 | 18 | + hg status |
|
29 | 19 | M a |
@@ -67,7 +57,6 b' 1' | |||
|
67 | 57 | |
|
68 | 58 | |
|
69 | 59 | + hg diff |
|
70 | + sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/' | |
|
71 | 60 | diff -r 1e71731e6fbb a |
|
72 | 61 | --- a/a |
|
73 | 62 | +++ b/a |
General Comments 0
You need to be logged in to leave comments.
Login now