Show More
@@ -24,7 +24,7 b' writing tests:' | |||
|
24 | 24 | - changeset hashes will change based on user and date which make |
|
25 | 25 | things like hg history output change |
|
26 | 26 | |
|
27 | use commit -m "test" -u test -d "0 0" | |
|
27 | use commit -m "test" -u test -d "1000000 0" | |
|
28 | 28 | |
|
29 | 29 | - diff will show the current time |
|
30 | 30 |
@@ -5,8 +5,8 b' cd rep' | |||
|
5 | 5 | mkdir dir |
|
6 | 6 | touch foo dir/bar |
|
7 | 7 | hg -v addremove |
|
8 | hg -v commit -m "add 1" -d "0 0" | |
|
8 | hg -v commit -m "add 1" -d "1000000 0" | |
|
9 | 9 | cd dir/ |
|
10 | 10 | touch ../foo_2 bar_2 |
|
11 | 11 | hg -v addremove |
|
12 | hg -v commit -m "add 2" -d "0 0" | |
|
12 | hg -v commit -m "add 2" -d "1000000 0" |
@@ -2,11 +2,11 b'' | |||
|
2 | 2 | hg init |
|
3 | 3 | echo This is file a1 > a |
|
4 | 4 | hg add a |
|
5 | hg commit -m "commit #0" -d "0 0" | |
|
5 | hg commit -m "commit #0" -d "1000000 0" | |
|
6 | 6 | ls |
|
7 | 7 | echo This is file b1 > b |
|
8 | 8 | hg add b |
|
9 | hg commit -m "commit #1" -d "0 0" | |
|
9 | hg commit -m "commit #1" -d "1000000 0" | |
|
10 | 10 | hg co 0 |
|
11 | 11 | # B should disappear |
|
12 | 12 | ls |
@@ -5,7 +5,7 b' cd t' | |||
|
5 | 5 | hg init |
|
6 | 6 | echo a > a |
|
7 | 7 | hg add a |
|
8 | hg commit -m test -d "0 0" | |
|
8 | hg commit -m test -d "1000000 0" | |
|
9 | 9 | hg history |
|
10 | 10 | hg manifest |
|
11 | 11 | hg cat a |
@@ -1,7 +1,7 b'' | |||
|
1 |
changeset: 0: |
|
|
1 | changeset: 0:0acdaf898367 | |
|
2 | 2 | tag: tip |
|
3 | 3 | user: test |
|
4 |
date: |
|
|
4 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
5 | 5 | summary: test |
|
6 | 6 | |
|
7 | 7 | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a |
@@ -5,12 +5,12 b' cd t' | |||
|
5 | 5 | hg init |
|
6 | 6 | echo 0 > a |
|
7 | 7 | echo 0 > b |
|
8 | hg ci -A -m m -d "0 0" | |
|
8 | hg ci -A -m m -d "1000000 0" | |
|
9 | 9 | hg rm a |
|
10 | 10 | hg cat a |
|
11 | 11 | sleep 1 # make sure mtime is changed |
|
12 | 12 | echo 1 > b |
|
13 | hg ci -m m -d "0 0" | |
|
13 | hg ci -m m -d "1000000 0" | |
|
14 | 14 | echo 2 > b |
|
15 | 15 | hg cat -r 0 a |
|
16 | 16 | hg cat -r 0 b |
@@ -3,5 +3,5 b' adding b' | |||
|
3 | 3 | 0 |
|
4 | 4 | 0 |
|
5 | 5 | 0 |
|
6 |
a: No such file in rev |
|
|
6 | a: No such file in rev 03f6b0774996 | |
|
7 | 7 | 1 |
@@ -15,5 +15,5 b" hg commit -d '111111111111 0' -m commit-" | |||
|
15 | 15 | echo bar > bar |
|
16 | 16 | hg add bar |
|
17 | 17 | rm bar |
|
18 | hg commit -d "0 0" -m commit-8 2>&1 | sed -e "s:/.*\(/test/.*\):...\1:" | |
|
18 | hg commit -d "1000000 0" -m commit-8 2>&1 | sed -e "s:/.*\(/test/.*\):...\1:" | |
|
19 | 19 | exit 0 |
@@ -3,12 +3,12 b'' | |||
|
3 | 3 | hg init |
|
4 | 4 | echo "nothing" > a |
|
5 | 5 | hg add a |
|
6 | hg commit -m ancestor -d "0 0" | |
|
6 | hg commit -m ancestor -d "1000000 0" | |
|
7 | 7 | echo "something" > a |
|
8 | hg commit -m branch1 -d "0 0" | |
|
8 | hg commit -m branch1 -d "1000000 0" | |
|
9 | 9 | hg co 0 |
|
10 | 10 | echo "something else" > a |
|
11 | hg commit -m branch2 -d "0 0" | |
|
11 | hg commit -m branch2 -d "1000000 0" | |
|
12 | 12 | HGMERGE=merge; export HGMERGE |
|
13 | 13 | hg up -m 1 |
|
14 | 14 | hg id |
@@ -1,7 +1,7 b'' | |||
|
1 | 1 | merge: warning: conflicts during merge |
|
2 | 2 | merging a |
|
3 | 3 | merging a failed! |
|
4 | 32e80765d7fe+75234512624c+ tip | |
|
4 | e7fe8eb3e180+0d24b7662d3e+ tip | |
|
5 | 5 | something else |
|
6 | 6 | ======= |
|
7 | 7 | something |
@@ -3,7 +3,7 b'' | |||
|
3 | 3 | hg init |
|
4 | 4 | echo foo > a |
|
5 | 5 | hg add a |
|
6 | hg commit -m "1" -d "0 0" | |
|
6 | hg commit -m "1" -d "1000000 0" | |
|
7 | 7 | |
|
8 | 8 | echo bar > b |
|
9 | 9 | hg add b |
@@ -22,11 +22,11 b' rm b' | |||
|
22 | 22 | |
|
23 | 23 | hg co -C 0 |
|
24 | 24 | echo foo-a > a |
|
25 | hg commit -m "2a" -d "0 0" | |
|
25 | hg commit -m "2a" -d "1000000 0" | |
|
26 | 26 | |
|
27 | 27 | hg co -C 0 |
|
28 | 28 | echo foo-b > a |
|
29 | hg commit -m "2b" -d "0 0" | |
|
29 | hg commit -m "2b" -d "1000000 0" | |
|
30 | 30 | |
|
31 | 31 | HGMERGE=true hg update -m 1 |
|
32 | 32 |
@@ -3,11 +3,11 b'' | |||
|
3 | 3 | hg init |
|
4 | 4 | echo a > a |
|
5 | 5 | hg add a |
|
6 | hg commit -m "1" -d "0 0" | |
|
6 | hg commit -m "1" -d "1000000 0" | |
|
7 | 7 | hg status |
|
8 | 8 | hg copy a b |
|
9 | 9 | hg status |
|
10 | hg --debug commit -m "2" -d "0 0" | |
|
10 | hg --debug commit -m "2" -d "1000000 0" | |
|
11 | 11 | echo "we should see two history entries" |
|
12 | 12 | hg history -v |
|
13 | 13 | echo "we should see one log entry for a" |
@@ -2,37 +2,37 b' A b' | |||
|
2 | 2 | b |
|
3 | 3 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
4 | 4 | we should see two history entries |
|
5 | changeset: 1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8 | |
|
5 | changeset: 1:386a3cc01532710ca78aed9a54fa2f459c04f29c | |
|
6 | 6 | tag: tip |
|
7 | 7 | user: test |
|
8 |
date: |
|
|
8 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
9 | 9 | files: b |
|
10 | 10 | description: |
|
11 | 11 | 2 |
|
12 | 12 | |
|
13 | 13 | |
|
14 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
|
14 | changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1 | |
|
15 | 15 | user: test |
|
16 |
date: |
|
|
16 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
17 | 17 | files: a |
|
18 | 18 | description: |
|
19 | 19 | 1 |
|
20 | 20 | |
|
21 | 21 | |
|
22 | 22 | we should see one log entry for a |
|
23 |
changeset: 0: |
|
|
23 | changeset: 0:33aaa84a386b | |
|
24 | 24 | user: test |
|
25 |
date: |
|
|
25 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
26 | 26 | summary: 1 |
|
27 | 27 | |
|
28 | 28 | this should show a revision linked to changeset 0 |
|
29 | 29 | rev offset length base linkrev nodeid p1 p2 |
|
30 | 30 | 0 0 3 0 0 b789fdd96dc2 000000000000 000000000000 |
|
31 | 31 | we should see one log entry for b |
|
32 |
changeset: 1:3 |
|
|
32 | changeset: 1:386a3cc01532 | |
|
33 | 33 | tag: tip |
|
34 | 34 | user: test |
|
35 |
date: |
|
|
35 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
36 | 36 | summary: 2 |
|
37 | 37 | |
|
38 | 38 | this should show a revision linked to changeset 1 |
@@ -3,7 +3,7 b'' | |||
|
3 | 3 | hg init |
|
4 | 4 | touch a |
|
5 | 5 | hg add a |
|
6 | hg ci -m "a" -d "0 0" | |
|
6 | hg ci -m "a" -d "1000000 0" | |
|
7 | 7 | |
|
8 | 8 | echo 123 > b |
|
9 | 9 | hg add b |
@@ -1,19 +1,19 b'' | |||
|
1 |
diff -r |
|
|
1 | diff -r acd8075edac9 b | |
|
2 | 2 | --- /dev/null |
|
3 | 3 | +++ b/b |
|
4 | 4 | @@ -0,0 +1,1 @@ |
|
5 | 5 | +123 |
|
6 |
diff -r |
|
|
6 | diff -r acd8075edac9 b | |
|
7 | 7 | --- /dev/null |
|
8 | 8 | +++ b/b |
|
9 | 9 | @@ -0,0 +1,1 @@ |
|
10 | 10 | +123 |
|
11 |
diff -r |
|
|
11 | diff -r acd8075edac9 a | |
|
12 | 12 | --- a/a |
|
13 | 13 | +++ b/a |
|
14 | 14 | @@ -0,0 +1,1 @@ |
|
15 | 15 | +foo |
|
16 |
diff -r |
|
|
16 | diff -r acd8075edac9 b | |
|
17 | 17 | --- /dev/null |
|
18 | 18 | +++ b/b |
|
19 | 19 | @@ -0,0 +1,1 @@ |
@@ -3,11 +3,11 b'' | |||
|
3 | 3 | hg init |
|
4 | 4 | echo 123 > a |
|
5 | 5 | hg add a |
|
6 | hg commit -m "first" -d "0 0" a | |
|
6 | hg commit -m "first" -d "1000000 0" a | |
|
7 | 7 | mkdir sub |
|
8 | 8 | echo 321 > sub/b |
|
9 | 9 | hg add sub/b |
|
10 | hg commit -m "second" -d "0 0" sub/b | |
|
10 | hg commit -m "second" -d "1000000 0" sub/b | |
|
11 | 11 | cat sub/b |
|
12 | 12 | hg co 0 |
|
13 | 13 | cat sub/b 2>/dev/null || echo "sub/b not present" |
@@ -13,7 +13,7 b' EOF' | |||
|
13 | 13 | |
|
14 | 14 | echo "this is a test" | gzip > a.gz |
|
15 | 15 | hg add a.gz |
|
16 | hg ci -m "test" -d "0 0" | |
|
16 | hg ci -m "test" -d "1000000 0" | |
|
17 | 17 | echo %% no changes |
|
18 | 18 | hg status |
|
19 | 19 | touch a.gz |
@@ -6,24 +6,24 b' echo foo > a' | |||
|
6 | 6 | echo foo > b |
|
7 | 7 | hg add a b |
|
8 | 8 | |
|
9 | hg ci -m "test" -d "0 0" | |
|
9 | hg ci -m "test" -d "1000000 0" | |
|
10 | 10 | |
|
11 | 11 | echo blah > a |
|
12 | 12 | |
|
13 | hg ci -m "branch a" -d "0 0" | |
|
13 | hg ci -m "branch a" -d "1000000 0" | |
|
14 | 14 | |
|
15 | 15 | hg co 0 |
|
16 | 16 | |
|
17 | 17 | echo blah > b |
|
18 | 18 | |
|
19 | hg ci -m "branch b" -d "0 0" | |
|
19 | hg ci -m "branch b" -d "1000000 0" | |
|
20 | 20 | HGMERGE=true hg up -m 1 |
|
21 | 21 | |
|
22 | hg ci -m "merge b/a -> blah" -d "0 0" | |
|
22 | hg ci -m "merge b/a -> blah" -d "1000000 0" | |
|
23 | 23 | |
|
24 | 24 | hg co 1 |
|
25 | 25 | HGMERGE=true hg up -m 2 |
|
26 | hg ci -m "merge a/b -> blah" -d "0 0" | |
|
26 | hg ci -m "merge a/b -> blah" -d "1000000 0" | |
|
27 | 27 | |
|
28 | 28 | hg log |
|
29 | 29 | hg debugindex .hg/00changelog.i |
@@ -1,40 +1,40 b'' | |||
|
1 |
changeset: 4: |
|
|
1 | changeset: 4:f6c172c6198c | |
|
2 | 2 | tag: tip |
|
3 | parent: 1:96155394af80 | |
|
4 | parent: 2:92cc4c306b19 | |
|
3 | parent: 1:448a8c5e42f1 | |
|
4 | parent: 2:7c5dc2e857f2 | |
|
5 | 5 | user: test |
|
6 |
date: |
|
|
6 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
7 | 7 | summary: merge a/b -> blah |
|
8 | 8 | |
|
9 |
changeset: 3: |
|
|
10 | parent: 2:92cc4c306b19 | |
|
11 | parent: 1:96155394af80 | |
|
9 | changeset: 3:13d875a22764 | |
|
10 | parent: 2:7c5dc2e857f2 | |
|
11 | parent: 1:448a8c5e42f1 | |
|
12 | 12 | user: test |
|
13 |
date: |
|
|
13 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
14 | 14 | summary: merge b/a -> blah |
|
15 | 15 | |
|
16 | changeset: 2:92cc4c306b19 | |
|
17 |
parent: 0: |
|
|
16 | changeset: 2:7c5dc2e857f2 | |
|
17 | parent: 0:dc1751ec2e9d | |
|
18 | 18 | user: test |
|
19 |
date: |
|
|
19 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
20 | 20 | summary: branch b |
|
21 | 21 | |
|
22 | changeset: 1:96155394af80 | |
|
22 | changeset: 1:448a8c5e42f1 | |
|
23 | 23 | user: test |
|
24 |
date: |
|
|
24 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
25 | 25 | summary: branch a |
|
26 | 26 | |
|
27 |
changeset: 0: |
|
|
27 | changeset: 0:dc1751ec2e9d | |
|
28 | 28 | user: test |
|
29 |
date: |
|
|
29 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
30 | 30 | summary: test |
|
31 | 31 | |
|
32 | 32 | rev offset length base linkrev nodeid p1 p2 |
|
33 |
0 0 6 |
|
|
34 |
1 6 |
|
|
35 |
2 1 |
|
|
36 | 3 184 69 3 3 e16a66a37edd 92cc4c306b19 96155394af80 | |
|
37 | 4 253 29 3 4 2ee31f665a86 96155394af80 92cc4c306b19 | |
|
33 | 0 0 64 0 0 dc1751ec2e9d 000000000000 000000000000 | |
|
34 | 1 64 68 1 1 448a8c5e42f1 dc1751ec2e9d 000000000000 | |
|
35 | 2 132 68 2 2 7c5dc2e857f2 dc1751ec2e9d 000000000000 | |
|
36 | 3 200 75 3 3 13d875a22764 7c5dc2e857f2 448a8c5e42f1 | |
|
37 | 4 275 29 3 4 f6c172c6198c 448a8c5e42f1 7c5dc2e857f2 | |
|
38 | 38 | |
|
39 | 39 | 1 |
|
40 | 40 | 79d7492df40aa0fa093ec4209be78043c181f094 644 a |
@@ -17,7 +17,7 b' echo 1 > bar' | |||
|
17 | 17 | echo 1 > baz |
|
18 | 18 | echo 1 > quux |
|
19 | 19 | hg add foo bar baz quux |
|
20 | hg commit -m "base" -d "0 0" | |
|
20 | hg commit -m "base" -d "1000000 0" | |
|
21 | 21 | |
|
22 | 22 | cd .. |
|
23 | 23 | hg clone a b |
@@ -26,7 +26,7 b' echo creating branch a' | |||
|
26 | 26 | cd a |
|
27 | 27 | echo 2a > foo |
|
28 | 28 | echo 2a > bar |
|
29 | hg commit -m "branch a" -d "0 0" | |
|
29 | hg commit -m "branch a" -d "1000000 0" | |
|
30 | 30 | |
|
31 | 31 | echo creating branch b |
|
32 | 32 | |
@@ -34,7 +34,7 b' cd ..' | |||
|
34 | 34 | cd b |
|
35 | 35 | echo 2b > foo |
|
36 | 36 | echo 2b > baz |
|
37 | hg commit -m "branch b" -d "0 0" | |
|
37 | hg commit -m "branch b" -d "1000000 0" | |
|
38 | 38 | |
|
39 | 39 | echo "we shouldn't have anything but n state here" |
|
40 | 40 | hg debugstate | cut -b 1-16,35- |
@@ -50,7 +50,7 b' echo new > quux' | |||
|
50 | 50 | echo "we shouldn't have anything but foo in merge state here" |
|
51 | 51 | hg debugstate | cut -b 1-16,35- | grep "^m" |
|
52 | 52 | |
|
53 | hg ci -m "merge" -d "0 0" | |
|
53 | hg ci -m "merge" -d "1000000 0" | |
|
54 | 54 | |
|
55 | 55 | echo "main: we should have a merge here" |
|
56 | 56 | hg debugindex .hg/00changelog.i |
@@ -25,17 +25,17 b" we shouldn't have anything but foo in me" | |||
|
25 | 25 | m 644 3 foo |
|
26 | 26 | main: we should have a merge here |
|
27 | 27 | rev offset length base linkrev nodeid p1 p2 |
|
28 |
0 0 7 |
|
|
29 |
1 7 |
|
|
30 |
2 1 |
|
|
31 | 3 209 66 3 3 d8a521142a3c f6718a9cb7f3 bdd988058d16 | |
|
28 | 0 0 77 0 0 c36078bec30d 000000000000 000000000000 | |
|
29 | 1 77 73 1 1 182b283965f1 c36078bec30d 000000000000 | |
|
30 | 2 150 71 2 2 a6aef98656b7 c36078bec30d 000000000000 | |
|
31 | 3 221 72 3 3 0c2cc6fc80e2 182b283965f1 a6aef98656b7 | |
|
32 | 32 | log should show foo and quux changed |
|
33 | changeset: 3:d8a521142a3c02186ee6c7254738a7e6427ed4c8 | |
|
33 | changeset: 3:0c2cc6fc80e2d4ee289bb658dbbe9ad932380fe9 | |
|
34 | 34 | tag: tip |
|
35 | parent: 1:f6718a9cb7f31f1a92d27bd6544c71617d6d4e4f | |
|
36 | parent: 2:bdd988058d16e2d7392958eace7b64817e44a54e | |
|
35 | parent: 1:182b283965f1069c0112784e30e7755ad1c0dd52 | |
|
36 | parent: 2:a6aef98656b71154cae9d87408abe6d0218c8045 | |
|
37 | 37 | user: test |
|
38 |
date: |
|
|
38 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
39 | 39 | files: foo quux |
|
40 | 40 | description: |
|
41 | 41 | merge |
@@ -7,7 +7,7 b' cd test1' | |||
|
7 | 7 | hg init |
|
8 | 8 | touch a b |
|
9 | 9 | hg add a b |
|
10 | hg ci -m "added a b" -d "0 0" | |
|
10 | hg ci -m "added a b" -d "1000000 0" | |
|
11 | 11 | |
|
12 | 12 | cd .. |
|
13 | 13 | mkdir test2 |
@@ -17,11 +17,11 b' hg init' | |||
|
17 | 17 | hg pull ../test1 |
|
18 | 18 | hg co |
|
19 | 19 | chmod +x a |
|
20 | hg ci -m "chmod +x a" -d "0 0" | |
|
20 | hg ci -m "chmod +x a" -d "1000000 0" | |
|
21 | 21 | |
|
22 | 22 | cd ../test1 |
|
23 | 23 | echo 123 >>a |
|
24 | hg ci -m "a updated" -d "0 0" | |
|
24 | hg ci -m "a updated" -d "1000000 0" | |
|
25 | 25 | |
|
26 | 26 | hg pull ../test2 |
|
27 | 27 | hg heads |
@@ -12,33 +12,33 b' adding manifests' | |||
|
12 | 12 | adding file changes |
|
13 | 13 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
14 | 14 | (run 'hg update' to get a working copy) |
|
15 |
changeset: 2: |
|
|
15 | changeset: 2:b833d578451e | |
|
16 | 16 | tag: tip |
|
17 |
parent: 0: |
|
|
17 | parent: 0:4536b1c2ca69 | |
|
18 | 18 | user: test |
|
19 |
date: |
|
|
19 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
20 | 20 | summary: chmod +x a |
|
21 | 21 | |
|
22 |
changeset: 1: |
|
|
22 | changeset: 1:a187cb361a5a | |
|
23 | 23 | user: test |
|
24 |
date: |
|
|
24 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
25 | 25 | summary: a updated |
|
26 | 26 | |
|
27 |
changeset: 2: |
|
|
27 | changeset: 2:b833d578451e | |
|
28 | 28 | tag: tip |
|
29 |
parent: 0: |
|
|
29 | parent: 0:4536b1c2ca69 | |
|
30 | 30 | user: test |
|
31 |
date: |
|
|
31 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
32 | 32 | summary: chmod +x a |
|
33 | 33 | |
|
34 |
changeset: 1: |
|
|
34 | changeset: 1:a187cb361a5a | |
|
35 | 35 | user: test |
|
36 |
date: |
|
|
36 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
37 | 37 | summary: a updated |
|
38 | 38 | |
|
39 |
changeset: 0: |
|
|
39 | changeset: 0:4536b1c2ca69 | |
|
40 | 40 | user: test |
|
41 |
date: |
|
|
41 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
42 | 42 | summary: added a b |
|
43 | 43 | |
|
44 | 44 | resolving manifests |
@@ -10,7 +10,7 b" echo 'precommit = echo precommit hook: p" | |||
|
10 | 10 | echo 'pretxncommit = echo pretxncommit hook: n=$HG_NODE p1=$HG_PARENT1 p2=$HG_PARENT2; hg -q tip' >> .hg/hgrc |
|
11 | 11 | echo a > a |
|
12 | 12 | hg add a |
|
13 | hg commit -m a -d "0 0" | |
|
13 | hg commit -m a -d "1000000 0" | |
|
14 | 14 | |
|
15 | 15 | hg clone . ../b |
|
16 | 16 | cd ../b |
@@ -1,28 +1,28 b'' | |||
|
1 | 1 | precommit hook: p1=0000000000000000000000000000000000000000 p2= |
|
2 |
pretxncommit hook: n= |
|
|
3 | 0:cb9a9f314b8b | |
|
4 |
commit hook: n= |
|
|
2 | pretxncommit hook: n=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p1=0000000000000000000000000000000000000000 p2= | |
|
3 | 0:29b62aeb769f | |
|
4 | commit hook: n=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p1=0000000000000000000000000000000000000000 p2= | |
|
5 | 5 | commit hook b |
|
6 | precommit hook: p1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p2= | |
|
7 | pretxncommit hook: n=ab228980c14deea8b9555d91c9581127383e40fd p1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p2= | |
|
8 | 1:ab228980c14d | |
|
9 | commit hook: n=ab228980c14deea8b9555d91c9581127383e40fd p1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p2= | |
|
6 | precommit hook: p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2= | |
|
7 | pretxncommit hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2= | |
|
8 | 1:b702efe96888 | |
|
9 | commit hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2= | |
|
10 | 10 | commit hook b |
|
11 | precommit hook: p1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p2= | |
|
12 | pretxncommit hook: n=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 p1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p2= | |
|
13 | 2:ee9deb46ab31 | |
|
14 | commit hook: n=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 p1=cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b p2= | |
|
11 | precommit hook: p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2= | |
|
12 | pretxncommit hook: n=1324a5531bac09b329c3845d35ae6a7526874edb p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2= | |
|
13 | 2:1324a5531bac | |
|
14 | commit hook: n=1324a5531bac09b329c3845d35ae6a7526874edb p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2= | |
|
15 | 15 | commit hook b |
|
16 | precommit hook: p1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 p2=ab228980c14deea8b9555d91c9581127383e40fd | |
|
17 | pretxncommit hook: n=07f3376c1e655977439df2a814e3cc14b27abac2 p1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 p2=ab228980c14deea8b9555d91c9581127383e40fd | |
|
18 | 3:07f3376c1e65 | |
|
19 | commit hook: n=07f3376c1e655977439df2a814e3cc14b27abac2 p1=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 p2=ab228980c14deea8b9555d91c9581127383e40fd | |
|
16 | precommit hook: p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2 | |
|
17 | pretxncommit hook: n=4c52fb2e402287dd5dc052090682536c8406c321 p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2 | |
|
18 | 3:4c52fb2e4022 | |
|
19 | commit hook: n=4c52fb2e402287dd5dc052090682536c8406c321 p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2 | |
|
20 | 20 | commit hook b |
|
21 | 21 | prechangegroup hook |
|
22 | changegroup hook: n=ab228980c14deea8b9555d91c9581127383e40fd | |
|
23 | incoming hook: n=ab228980c14deea8b9555d91c9581127383e40fd | |
|
24 | incoming hook: n=ee9deb46ab31e4cc3310f3cf0c3d668e4d8fffc2 | |
|
25 | incoming hook: n=07f3376c1e655977439df2a814e3cc14b27abac2 | |
|
22 | changegroup hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 | |
|
23 | incoming hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 | |
|
24 | incoming hook: n=1324a5531bac09b329c3845d35ae6a7526874edb | |
|
25 | incoming hook: n=4c52fb2e402287dd5dc052090682536c8406c321 | |
|
26 | 26 | pulling from ../a |
|
27 | 27 | searching for changes |
|
28 | 28 | adding changesets |
@@ -30,40 +30,40 b' adding manifests' | |||
|
30 | 30 | adding file changes |
|
31 | 31 | added 3 changesets with 2 changes to 2 files |
|
32 | 32 | (run 'hg update' to get a working copy) |
|
33 | pretag hook: t=a n=07f3376c1e655977439df2a814e3cc14b27abac2 l=0 | |
|
34 | precommit hook: p1=07f3376c1e655977439df2a814e3cc14b27abac2 p2= | |
|
35 | pretxncommit hook: n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 p1=07f3376c1e655977439df2a814e3cc14b27abac2 p2= | |
|
36 | 4:3cd2c6a5a36c | |
|
37 | commit hook: n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 p1=07f3376c1e655977439df2a814e3cc14b27abac2 p2= | |
|
33 | pretag hook: t=a n=4c52fb2e402287dd5dc052090682536c8406c321 l=0 | |
|
34 | precommit hook: p1=4c52fb2e402287dd5dc052090682536c8406c321 p2= | |
|
35 | pretxncommit hook: n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p1=4c52fb2e402287dd5dc052090682536c8406c321 p2= | |
|
36 | 4:4f92e785b90a | |
|
37 | commit hook: n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p1=4c52fb2e402287dd5dc052090682536c8406c321 p2= | |
|
38 | 38 | commit hook b |
|
39 | tag hook: t=a n=07f3376c1e655977439df2a814e3cc14b27abac2 l=0 | |
|
40 | pretag hook: t=la n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 l=1 | |
|
41 | tag hook: t=la n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 l=1 | |
|
42 | pretag hook: t=fa n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 l=0 | |
|
39 | tag hook: t=a n=4c52fb2e402287dd5dc052090682536c8406c321 l=0 | |
|
40 | pretag hook: t=la n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 l=1 | |
|
41 | tag hook: t=la n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 l=1 | |
|
42 | pretag hook: t=fa n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 l=0 | |
|
43 | 43 | pretag.forbid hook |
|
44 | 44 | abort: pretag.forbid hook exited with status 1 |
|
45 | pretag hook: t=fla n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 l=1 | |
|
45 | pretag hook: t=fla n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 l=1 | |
|
46 | 46 | pretag.forbid hook |
|
47 | 47 | abort: pretag.forbid hook exited with status 1 |
|
48 | 4:3cd2c6a5a36c | |
|
49 | precommit hook: p1=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 p2= | |
|
50 | pretxncommit hook: n=469a61fe67d64df9a5023e4c2b8a0b85c61e9b69 p1=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 p2= | |
|
51 | 5:469a61fe67d6 | |
|
52 |
pretxncommit.forbid hook: tip=5: |
|
|
48 | 4:4f92e785b90a | |
|
49 | precommit hook: p1=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p2= | |
|
50 | pretxncommit hook: n=7792358308a2026661cea44f9d47c072813004cb p1=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p2= | |
|
51 | 5:7792358308a2 | |
|
52 | pretxncommit.forbid hook: tip=5:7792358308a2 | |
|
53 | 53 | abort: pretxncommit.forbid hook exited with status 1 |
|
54 | 54 | transaction abort! |
|
55 | 55 | rollback completed |
|
56 | 4:3cd2c6a5a36c | |
|
57 | precommit hook: p1=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 p2= | |
|
56 | 4:4f92e785b90a | |
|
57 | precommit hook: p1=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 p2= | |
|
58 | 58 | precommit.forbid hook |
|
59 | 59 | abort: precommit.forbid hook exited with status 1 |
|
60 | 4:3cd2c6a5a36c | |
|
61 | 3:07f3376c1e65 | |
|
60 | 4:4f92e785b90a | |
|
61 | 3:4c52fb2e4022 | |
|
62 | 62 | prechangegroup.forbid hook |
|
63 | 63 | pulling from ../a |
|
64 | 64 | searching for changes |
|
65 | 65 | abort: prechangegroup.forbid hook exited with status 1 |
|
66 |
pretxnchangegroup.forbid hook: tip=4: |
|
|
66 | pretxnchangegroup.forbid hook: tip=4:4f92e785b90a | |
|
67 | 67 | pulling from ../a |
|
68 | 68 | searching for changes |
|
69 | 69 | adding changesets |
@@ -73,9 +73,9 b' added 1 changesets with 1 changes to 1 f' | |||
|
73 | 73 | abort: pretxnchangegroup.forbid hook exited with status 1 |
|
74 | 74 | transaction abort! |
|
75 | 75 | rollback completed |
|
76 | 3:07f3376c1e65 | |
|
76 | 3:4c52fb2e4022 | |
|
77 | 77 | preoutgoing hook: s=pull |
|
78 | outgoing hook: n=3cd2c6a5a36c5908aad3bc0d717c29873a05dfc2 s=pull | |
|
78 | outgoing hook: n=4f92e785b90ae8995dfe156e39dd4fbc3b346a24 s=pull | |
|
79 | 79 | pulling from ../a |
|
80 | 80 | searching for changes |
|
81 | 81 | adding changesets |
@@ -5,13 +5,13 b' cd t' | |||
|
5 | 5 | hg init |
|
6 | 6 | echo 0 > a |
|
7 | 7 | echo 0 > b |
|
8 | hg ci -A -m m -d "0 0" | |
|
8 | hg ci -A -m m -d "1000000 0" | |
|
9 | 9 | touch nottracked |
|
10 | 10 | hg locate a |
|
11 | 11 | hg locate NONEXISTENT |
|
12 | 12 | hg locate |
|
13 | 13 | hg rm a |
|
14 | hg ci -m m -d "0 0" | |
|
14 | hg ci -m m -d "1000000 0" | |
|
15 | 15 | hg locate a |
|
16 | 16 | hg locate NONEXISTENT |
|
17 | 17 | hg locate |
@@ -8,6 +8,6 b' a: No such file or directory' | |||
|
8 | 8 | NONEXISTENT: No such file or directory |
|
9 | 9 | b |
|
10 | 10 | a |
|
11 |
NONEXISTENT: No such file in rev |
|
|
11 | NONEXISTENT: No such file in rev 14467d15ef43 | |
|
12 | 12 | a |
|
13 | 13 | b |
@@ -6,9 +6,9 b' hg init' | |||
|
6 | 6 | echo "added file1" > file1 |
|
7 | 7 | echo "added file2" > file2 |
|
8 | 8 | hg add file1 file2 |
|
9 | hg commit -m "added file1 and file2" -d "0 0" -u user | |
|
9 | hg commit -m "added file1 and file2" -d "1000000 0" -u user | |
|
10 | 10 | echo "changed file1" >> file1 |
|
11 | hg commit -m "changed file1" -d "0 0" -u user | |
|
11 | hg commit -m "changed file1" -d "1000000 0" -u user | |
|
12 | 12 | hg -q log |
|
13 | 13 | hg id |
|
14 | 14 | hg update -C 0 |
@@ -1,12 +1,12 b'' | |||
|
1 | 1:3aa14bbc23d9 | |
|
2 | 0:8633637036c1 | |
|
3 | 3aa14bbc23d9 tip | |
|
4 | 8633637036c1 | |
|
5 | 8633637036c1+ | |
|
6 | 8633637036c1 | |
|
7 | 3aa14bbc23d9 tip | |
|
1 | 1:016807e6fdaf | |
|
2 | 0:eb43f19ff115 | |
|
3 | 016807e6fdaf tip | |
|
4 | eb43f19ff115 | |
|
5 | eb43f19ff115+ | |
|
6 | eb43f19ff115 | |
|
7 | 016807e6fdaf tip | |
|
8 | 8 | merging file1 |
|
9 | 3aa14bbc23d9 tip | |
|
10 | 3aa14bbc23d9 tip | |
|
11 | 3aa14bbc23d9 tip | |
|
12 | 3aa14bbc23d9 tip | |
|
9 | 016807e6fdaf tip | |
|
10 | 016807e6fdaf tip | |
|
11 | 016807e6fdaf tip | |
|
12 | 016807e6fdaf tip |
@@ -7,9 +7,9 b' echo "added file1" > file1' | |||
|
7 | 7 | echo "another line of text" >> file1 |
|
8 | 8 | echo "added file2" > file2 |
|
9 | 9 | hg add file1 file2 |
|
10 | hg commit -m "added file1 and file2" -d "0 0" -u user | |
|
10 | hg commit -m "added file1 and file2" -d "1000000 0" -u user | |
|
11 | 11 | echo "changed file1" >> file1 |
|
12 | hg commit -m "changed file1" -d "0 0" -u user | |
|
12 | hg commit -m "changed file1" -d "1000000 0" -u user | |
|
13 | 13 | hg -q log |
|
14 | 14 | hg id |
|
15 | 15 | hg update -C 0 |
@@ -1,14 +1,14 b'' | |||
|
1 | 1:f4d7a8c73d23 | |
|
2 | 0:232e179b3f29 | |
|
3 |
f |
|
|
4 | 232e179b3f29 | |
|
5 | 232e179b3f29+ | |
|
6 | 232e179b3f29 | |
|
7 |
f |
|
|
1 | 1:f248da0d4c3e | |
|
2 | 0:9eca13a34789 | |
|
3 | f248da0d4c3e tip | |
|
4 | 9eca13a34789 | |
|
5 | 9eca13a34789+ | |
|
6 | 9eca13a34789 | |
|
7 | f248da0d4c3e tip | |
|
8 | 8 | merge: warning: conflicts during merge |
|
9 | 9 | merging file1 |
|
10 | 10 | merging file1 failed! |
|
11 |
diff -r f |
|
|
11 | diff -r f248da0d4c3e file1 | |
|
12 | 12 | --- a/file1 |
|
13 | 13 | +++ b/file1 |
|
14 | 14 | @@ -1,3 +1,7 @@ added file1 |
@@ -20,7 +20,7 b' diff -r f4d7a8c73d23 file1' | |||
|
20 | 20 | changed file1 |
|
21 | 21 | +>>>>>>> |
|
22 | 22 | M file1 |
|
23 |
f |
|
|
24 |
f |
|
|
25 |
f |
|
|
26 |
f |
|
|
23 | f248da0d4c3e+ tip | |
|
24 | f248da0d4c3e tip | |
|
25 | f248da0d4c3e tip | |
|
26 | f248da0d4c3e tip |
@@ -11,15 +11,15 b' cd t' | |||
|
11 | 11 | hg init |
|
12 | 12 | echo This is file a1 > a |
|
13 | 13 | hg add a |
|
14 | hg commit -m "commit #0" -d "0 0" | |
|
14 | hg commit -m "commit #0" -d "1000000 0" | |
|
15 | 15 | echo This is file b1 > b |
|
16 | 16 | hg add b |
|
17 | hg commit -m "commit #1" -d "0 0" | |
|
17 | hg commit -m "commit #1" -d "1000000 0" | |
|
18 | 18 | |
|
19 | 19 | hg update 0 |
|
20 | 20 | echo This is file c1 > c |
|
21 | 21 | hg add c |
|
22 | hg commit -m "commit #2" -d "0 0" | |
|
22 | hg commit -m "commit #2" -d "1000000 0" | |
|
23 | 23 | echo This is file b1 > b |
|
24 | 24 | echo %% no merges expected |
|
25 | 25 | env HGMERGE=../merge hg update -m 1 |
@@ -30,15 +30,15 b' cd t' | |||
|
30 | 30 | hg init |
|
31 | 31 | echo This is file a1 > a |
|
32 | 32 | hg add a |
|
33 | hg commit -m "commit #0" -d "0 0" | |
|
33 | hg commit -m "commit #0" -d "1000000 0" | |
|
34 | 34 | echo This is file b1 > b |
|
35 | 35 | hg add b |
|
36 | hg commit -m "commit #1" -d "0 0" | |
|
36 | hg commit -m "commit #1" -d "1000000 0" | |
|
37 | 37 | |
|
38 | 38 | hg update 0 |
|
39 | 39 | echo This is file c1 > c |
|
40 | 40 | hg add c |
|
41 | hg commit -m "commit #2" -d "0 0" | |
|
41 | hg commit -m "commit #2" -d "1000000 0" | |
|
42 | 42 | echo This is file b2 > b |
|
43 | 43 | echo %% merge should fail |
|
44 | 44 | env HGMERGE=../merge hg update -m 1 |
@@ -52,16 +52,16 b' cd t' | |||
|
52 | 52 | hg init |
|
53 | 53 | echo This is file a1 > a |
|
54 | 54 | hg add a |
|
55 | hg commit -m "commit #0" -d "0 0" | |
|
55 | hg commit -m "commit #0" -d "1000000 0" | |
|
56 | 56 | echo This is file b1 > b |
|
57 | 57 | hg add b |
|
58 | hg commit -m "commit #1" -d "0 0" | |
|
58 | hg commit -m "commit #1" -d "1000000 0" | |
|
59 | 59 | echo This is file b22 > b |
|
60 | hg commit -m "commit #2" -d "0 0" | |
|
60 | hg commit -m "commit #2" -d "1000000 0" | |
|
61 | 61 | hg update 1 |
|
62 | 62 | echo This is file c1 > c |
|
63 | 63 | hg add c |
|
64 | hg commit -m "commit #3" -d "0 0" | |
|
64 | hg commit -m "commit #3" -d "1000000 0" | |
|
65 | 65 | |
|
66 | 66 | echo 'Contents of b should be "this is file b1"' |
|
67 | 67 | cat b |
@@ -78,16 +78,16 b' cd t' | |||
|
78 | 78 | hg init |
|
79 | 79 | echo This is file a1 > a |
|
80 | 80 | hg add a |
|
81 | hg commit -m "commit #0" -d "0 0" | |
|
81 | hg commit -m "commit #0" -d "1000000 0" | |
|
82 | 82 | echo This is file b1 > b |
|
83 | 83 | hg add b |
|
84 | hg commit -m "commit #1" -d "0 0" | |
|
84 | hg commit -m "commit #1" -d "1000000 0" | |
|
85 | 85 | echo This is file b22 > b |
|
86 | hg commit -m "commit #2" -d "0 0" | |
|
86 | hg commit -m "commit #2" -d "1000000 0" | |
|
87 | 87 | hg update 1 |
|
88 | 88 | echo This is file c1 > c |
|
89 | 89 | hg add c |
|
90 | hg commit -m "commit #3" -d "0 0" | |
|
90 | hg commit -m "commit #3" -d "1000000 0" | |
|
91 | 91 | echo This is file b33 > b |
|
92 | 92 | echo %% merge of b should fail |
|
93 | 93 | env HGMERGE=../merge hg update -m 2 |
@@ -5,15 +5,15 b' cd t' | |||
|
5 | 5 | hg init |
|
6 | 6 | echo This is file a1 > a |
|
7 | 7 | hg add a |
|
8 | hg commit -m "commit #0" -d "0 0" | |
|
8 | hg commit -m "commit #0" -d "1000000 0" | |
|
9 | 9 | echo This is file b1 > b |
|
10 | 10 | hg add b |
|
11 | hg commit -m "commit #1" -d "0 0" | |
|
11 | hg commit -m "commit #1" -d "1000000 0" | |
|
12 | 12 | rm b |
|
13 | 13 | hg update 0 |
|
14 | 14 | echo This is file b2 > b |
|
15 | 15 | hg add b |
|
16 | hg commit -m "commit #2" -d "0 0" | |
|
16 | hg commit -m "commit #2" -d "1000000 0" | |
|
17 | 17 | cd ..; /bin/rm -rf t |
|
18 | 18 | |
|
19 | 19 | mkdir t |
@@ -21,14 +21,14 b' cd t' | |||
|
21 | 21 | hg init |
|
22 | 22 | echo This is file a1 > a |
|
23 | 23 | hg add a |
|
24 | hg commit -m "commit #0" -d "0 0" | |
|
24 | hg commit -m "commit #0" -d "1000000 0" | |
|
25 | 25 | echo This is file b1 > b |
|
26 | 26 | hg add b |
|
27 | hg commit -m "commit #1" -d "0 0" | |
|
27 | hg commit -m "commit #1" -d "1000000 0" | |
|
28 | 28 | rm b |
|
29 | 29 | hg update 0 |
|
30 | 30 | echo This is file b2 > b |
|
31 | hg commit -A -m "commit #2" -d "0 0" | |
|
31 | hg commit -A -m "commit #2" -d "1000000 0" | |
|
32 | 32 | cd ..; /bin/rm -rf t |
|
33 | 33 | |
|
34 | 34 | mkdir t |
@@ -36,13 +36,13 b' cd t' | |||
|
36 | 36 | hg init |
|
37 | 37 | echo This is file a1 > a |
|
38 | 38 | hg add a |
|
39 | hg commit -m "commit #0" -d "0 0" | |
|
39 | hg commit -m "commit #0" -d "1000000 0" | |
|
40 | 40 | echo This is file b1 > b |
|
41 | 41 | hg add b |
|
42 | hg commit -m "commit #1" -d "0 0" | |
|
42 | hg commit -m "commit #1" -d "1000000 0" | |
|
43 | 43 | rm b |
|
44 | 44 | hg remove b |
|
45 | 45 | hg update 0 |
|
46 | 46 | echo This is file b2 > b |
|
47 | hg commit -A -m "commit #2" -d "0 0" | |
|
47 | hg commit -A -m "commit #2" -d "1000000 0" | |
|
48 | 48 | cd ..; /bin/rm -rf t |
@@ -3,8 +3,8 b'' | |||
|
3 | 3 | hg init |
|
4 | 4 | echo This is file a1 > a |
|
5 | 5 | hg add a |
|
6 | hg commit -m "commit #0" -d "0 0" | |
|
6 | hg commit -m "commit #0" -d "1000000 0" | |
|
7 | 7 | touch b |
|
8 | 8 | hg add b |
|
9 | 9 | rm b |
|
10 | hg commit -A -m"comment #1" -d "0 0" | |
|
10 | hg commit -A -m"comment #1" -d "1000000 0" |
@@ -3,15 +3,15 b'' | |||
|
3 | 3 | hg init |
|
4 | 4 | echo This is file a1 > a |
|
5 | 5 | hg add a |
|
6 | hg commit -m "commit #0" -d "0 0" | |
|
6 | hg commit -m "commit #0" -d "1000000 0" | |
|
7 | 7 | echo This is file b1 > b |
|
8 | 8 | hg add b |
|
9 | hg commit -m "commit #1" -d "0 0" | |
|
9 | hg commit -m "commit #1" -d "1000000 0" | |
|
10 | 10 | hg update 0 |
|
11 | 11 | echo This is file c1 > c |
|
12 | 12 | hg add c |
|
13 | hg commit -m "commit #2" -d "0 0" | |
|
13 | hg commit -m "commit #2" -d "1000000 0" | |
|
14 | 14 | hg update -m 1 |
|
15 | 15 | rm b |
|
16 | 16 | echo This is file c22 > c |
|
17 | hg commit -m "commit #3" -d "0 0" | |
|
17 | hg commit -m "commit #3" -d "1000000 0" |
@@ -6,12 +6,12 b' hg init' | |||
|
6 | 6 | echo This is file a1 > a |
|
7 | 7 | echo This is file b1 > b |
|
8 | 8 | hg add a b |
|
9 | hg commit -m "commit #0" -d "0 0" | |
|
9 | hg commit -m "commit #0" -d "1000000 0" | |
|
10 | 10 | echo This is file b22 > b |
|
11 | hg commit -m"comment #1" -d "0 0" | |
|
11 | hg commit -m"comment #1" -d "1000000 0" | |
|
12 | 12 | hg update 0 |
|
13 | 13 | rm b |
|
14 | hg commit -A -m"comment #2" -d "0 0" | |
|
14 | hg commit -A -m"comment #2" -d "1000000 0" | |
|
15 | 15 | # in theory, we shouldn't need the "yes k" below, but it prevents |
|
16 | 16 | # this test from hanging when "hg update" erroneously prompts the |
|
17 | 17 | # user for "keep or delete" |
@@ -13,7 +13,7 b' hg init' | |||
|
13 | 13 | echo This is file foo1 > foo |
|
14 | 14 | echo This is file bar1 > bar |
|
15 | 15 | hg add foo bar |
|
16 | hg commit -m "commit text" -d "0 0" | |
|
16 | hg commit -m "commit text" -d "1000000 0" | |
|
17 | 17 | |
|
18 | 18 | cd .. |
|
19 | 19 | hg clone A1 B1 |
@@ -21,11 +21,11 b' hg clone A1 B1' | |||
|
21 | 21 | cd A1 |
|
22 | 22 | rm bar |
|
23 | 23 | hg remove bar |
|
24 | hg commit -m "commit test" -d "0 0" | |
|
24 | hg commit -m "commit test" -d "1000000 0" | |
|
25 | 25 | |
|
26 | 26 | cd ../B1 |
|
27 | 27 | echo This is file foo22 > foo |
|
28 | hg commit -m "commit test" -d "0 0" | |
|
28 | hg commit -m "commit test" -d "1000000 0" | |
|
29 | 29 | |
|
30 | 30 | cd .. |
|
31 | 31 | hg clone A1 A2 |
@@ -34,13 +34,13 b' hg clone B1 B2' | |||
|
34 | 34 | cd A1 |
|
35 | 35 | hg pull ../B1 |
|
36 | 36 | hg update -m |
|
37 | hg commit -m "commit test" -d "0 0" | |
|
37 | hg commit -m "commit test" -d "1000000 0" | |
|
38 | 38 | echo bar should remain deleted. |
|
39 | 39 | hg manifest |
|
40 | 40 | |
|
41 | 41 | cd ../B2 |
|
42 | 42 | hg pull ../A2 |
|
43 | 43 | hg update -m |
|
44 | hg commit -m "commit test" -d "0 0" | |
|
44 | hg commit -m "commit test" -d "1000000 0" | |
|
45 | 45 | echo bar should remain deleted. |
|
46 | 46 | hg manifest |
@@ -9,7 +9,7 b' 2' | |||
|
9 | 9 | 3 |
|
10 | 10 | EOF |
|
11 | 11 | hg add test.txt |
|
12 | hg commit -m "Initial" -d "0 0" | |
|
12 | hg commit -m "Initial" -d "1000000 0" | |
|
13 | 13 | |
|
14 | 14 | # clone |
|
15 | 15 | cd .. |
@@ -22,7 +22,7 b' one' | |||
|
22 | 22 | two |
|
23 | 23 | three |
|
24 | 24 | EOF |
|
25 | hg commit -m "Numbers as words" -d "0 0" | |
|
25 | hg commit -m "Numbers as words" -d "1000000 0" | |
|
26 | 26 | |
|
27 | 27 | # change test-b |
|
28 | 28 | cd ../test-b |
@@ -31,7 +31,7 b' 1' | |||
|
31 | 31 | 2.5 |
|
32 | 32 | 3 |
|
33 | 33 | EOF |
|
34 | hg commit -m "2 -> 2.5" -d "0 0" | |
|
34 | hg commit -m "2 -> 2.5" -d "1000000 0" | |
|
35 | 35 | |
|
36 | 36 | # now pull and merge from test-a |
|
37 | 37 | hg pull ../test-a |
@@ -43,7 +43,7 b' two-point-five' | |||
|
43 | 43 | three |
|
44 | 44 | EOF |
|
45 | 45 | rm -f *.orig |
|
46 | hg commit -m "Merge 1" -d "0 0" | |
|
46 | hg commit -m "Merge 1" -d "1000000 0" | |
|
47 | 47 | |
|
48 | 48 | # change test-a again |
|
49 | 49 | cd ../test-a |
@@ -52,7 +52,7 b' one' | |||
|
52 | 52 | two-point-one |
|
53 | 53 | three |
|
54 | 54 | EOF |
|
55 | hg commit -m "two -> two-point-one" -d "0 0" | |
|
55 | hg commit -m "two -> two-point-one" -d "1000000 0" | |
|
56 | 56 | |
|
57 | 57 | # pull and merge from test-a again |
|
58 | 58 | cd ../test-b |
@@ -39,33 +39,33 b' three' | |||
|
39 | 39 | 2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000 |
|
40 | 40 | 3 31 27 2 3 fc3148072371 7b013192566a 8fe46a3eb557 |
|
41 | 41 | 4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000 |
|
42 |
changeset: 4: |
|
|
42 | changeset: 4:a070d41e8360 | |
|
43 | 43 | tag: tip |
|
44 | parent: 2:96b70246a118 | |
|
44 | parent: 2:faaea63e63a9 | |
|
45 | 45 | user: test |
|
46 |
date: |
|
|
46 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
47 | 47 | summary: two -> two-point-one |
|
48 | 48 | |
|
49 |
changeset: 3: |
|
|
50 |
parent: 1: |
|
|
51 | parent: 2:96b70246a118 | |
|
49 | changeset: 3:451c744aabcc | |
|
50 | parent: 1:e409be6afcc0 | |
|
51 | parent: 2:faaea63e63a9 | |
|
52 | 52 | user: test |
|
53 |
date: |
|
|
53 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
54 | 54 | summary: Merge 1 |
|
55 | 55 | |
|
56 | changeset: 2:96b70246a118 | |
|
57 |
parent: 0: |
|
|
56 | changeset: 2:faaea63e63a9 | |
|
57 | parent: 0:095c92b91f1a | |
|
58 | 58 | user: test |
|
59 |
date: |
|
|
59 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
60 | 60 | summary: Numbers as words |
|
61 | 61 | |
|
62 |
changeset: 1: |
|
|
62 | changeset: 1:e409be6afcc0 | |
|
63 | 63 | user: test |
|
64 |
date: |
|
|
64 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
65 | 65 | summary: 2 -> 2.5 |
|
66 | 66 | |
|
67 |
changeset: 0: |
|
|
67 | changeset: 0:095c92b91f1a | |
|
68 | 68 | user: test |
|
69 |
date: |
|
|
69 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
70 | 70 | summary: Initial |
|
71 | 71 |
@@ -3,7 +3,7 b'' | |||
|
3 | 3 | hg init |
|
4 | 4 | echo foo > a |
|
5 | 5 | hg add a |
|
6 | hg commit -m "1" -d "0 0" | |
|
6 | hg commit -m "1" -d "1000000 0" | |
|
7 | 7 | hg verify |
|
8 | 8 | chmod -r .hg/data/a.d |
|
9 | 9 | hg verify 2>/dev/null || echo verify failed |
@@ -11,5 +11,5 b' chmod +r .hg/data/a.d' | |||
|
11 | 11 | hg verify 2>/dev/null || echo verify failed |
|
12 | 12 | chmod -w .hg/data/a.d |
|
13 | 13 | echo barber > a |
|
14 | hg commit -m "2" -d "0 0" 2>/dev/null || echo commit failed | |
|
14 | hg commit -m "2" -d "1000000 0" 2>/dev/null || echo commit failed | |
|
15 | 15 |
@@ -5,7 +5,7 b' cd a' | |||
|
5 | 5 | hg init |
|
6 | 6 | echo foo > b |
|
7 | 7 | hg add b |
|
8 | hg ci -m "b" -d "0 0" | |
|
8 | hg ci -m "b" -d "1000000 0" | |
|
9 | 9 | |
|
10 | 10 | chmod -w .hg |
|
11 | 11 |
@@ -5,7 +5,7 b' cd a' | |||
|
5 | 5 | hg init |
|
6 | 6 | echo foo > t1 |
|
7 | 7 | hg add t1 |
|
8 | hg commit -m "1" -d "0 0" | |
|
8 | hg commit -m "1" -d "1000000 0" | |
|
9 | 9 | |
|
10 | 10 | cd .. |
|
11 | 11 | hg clone a b |
@@ -13,16 +13,16 b' hg clone a b' | |||
|
13 | 13 | cd a |
|
14 | 14 | echo foo > t2 |
|
15 | 15 | hg add t2 |
|
16 | hg commit -m "2" -d "0 0" | |
|
16 | hg commit -m "2" -d "1000000 0" | |
|
17 | 17 | |
|
18 | 18 | cd ../b |
|
19 | 19 | echo foo > t3 |
|
20 | 20 | hg add t3 |
|
21 | hg commit -m "3" -d "0 0" | |
|
21 | hg commit -m "3" -d "1000000 0" | |
|
22 | 22 | |
|
23 | 23 | hg push ../a |
|
24 | 24 | hg pull ../a |
|
25 | 25 | hg push ../a |
|
26 | 26 | hg up -m |
|
27 | hg commit -m "4" -d "0 0" | |
|
27 | hg commit -m "4" -d "1000000 0" | |
|
28 | 28 | hg push ../a |
@@ -2,32 +2,32 b'' | |||
|
2 | 2 | hg --debug init |
|
3 | 3 | echo this is a1 > a |
|
4 | 4 | hg add a |
|
5 | hg commit -m0 -d "0 0" | |
|
5 | hg commit -m0 -d "1000000 0" | |
|
6 | 6 | echo this is b1 > b |
|
7 | 7 | hg add b |
|
8 | hg commit -m1 -d "0 0" | |
|
8 | hg commit -m1 -d "1000000 0" | |
|
9 | 9 | hg manifest 1 |
|
10 | 10 | echo this is c1 > c |
|
11 | hg rawcommit -p 1 -d "0 0" -m2 c | |
|
11 | hg rawcommit -p 1 -d "1000000 0" -m2 c | |
|
12 | 12 | hg manifest 2 |
|
13 | 13 | hg parents |
|
14 | 14 | rm b |
|
15 | hg rawcommit -p 2 -d "0 0" -m3 b | |
|
15 | hg rawcommit -p 2 -d "1000000 0" -m3 b | |
|
16 | 16 | hg manifest 3 |
|
17 | 17 | hg parents |
|
18 | 18 | echo this is a22 > a |
|
19 | hg rawcommit -p 3 -d "0 0" -m4 a | |
|
19 | hg rawcommit -p 3 -d "1000000 0" -m4 a | |
|
20 | 20 | hg manifest 4 |
|
21 | 21 | hg parents |
|
22 | 22 | echo this is c22 > c |
|
23 | hg rawcommit -p 1 -d "0 0" -m5 c | |
|
23 | hg rawcommit -p 1 -d "1000000 0" -m5 c | |
|
24 | 24 | hg manifest 5 |
|
25 | 25 | hg parents |
|
26 | 26 | # merge, but no files changed |
|
27 | hg rawcommit -p 4 -p 5 -d "0 0" -m6 | |
|
27 | hg rawcommit -p 4 -p 5 -d "1000000 0" -m6 | |
|
28 | 28 | hg manifest 6 |
|
29 | 29 | hg parents |
|
30 | 30 | # no changes what-so-ever |
|
31 | hg rawcommit -p 6 -d "0 0" -m7 | |
|
31 | hg rawcommit -p 6 -d "1000000 0" -m7 | |
|
32 | 32 | hg manifest 7 |
|
33 | 33 | hg parents |
@@ -4,56 +4,56 b' 54837d97f2932a8194e69745a280a2c11e61ff9c' | |||
|
4 | 4 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
5 | 5 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
|
6 | 6 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
7 | changeset: 2:9f827976dae4 | |
|
7 | changeset: 2:e110db3db549 | |
|
8 | 8 | tag: tip |
|
9 | 9 | user: test |
|
10 |
date: |
|
|
10 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
11 | 11 | summary: 2 |
|
12 | 12 | |
|
13 | 13 | (the rawcommit command is deprecated) |
|
14 | 14 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
15 | 15 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
16 |
changeset: 3: |
|
|
16 | changeset: 3:0f9843914735 | |
|
17 | 17 | tag: tip |
|
18 | 18 | user: test |
|
19 |
date: |
|
|
19 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
20 | 20 | summary: 3 |
|
21 | 21 | |
|
22 | 22 | (the rawcommit command is deprecated) |
|
23 | 23 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
24 | 24 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
25 |
changeset: 4: |
|
|
25 | changeset: 4:909a3d1d3ee1 | |
|
26 | 26 | tag: tip |
|
27 | 27 | user: test |
|
28 |
date: |
|
|
28 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
29 | 29 | summary: 4 |
|
30 | 30 | |
|
31 | 31 | (the rawcommit command is deprecated) |
|
32 | 32 | 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a |
|
33 | 33 | 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b |
|
34 | 34 | 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c |
|
35 |
changeset: 4: |
|
|
35 | changeset: 4:909a3d1d3ee1 | |
|
36 | 36 | user: test |
|
37 |
date: |
|
|
37 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
38 | 38 | summary: 4 |
|
39 | 39 | |
|
40 | 40 | (the rawcommit command is deprecated) |
|
41 | 41 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
42 | 42 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
43 | changeset: 6:b4b8b9afa8cc | |
|
43 | changeset: 6:725fdd0728db | |
|
44 | 44 | tag: tip |
|
45 |
parent: 4: |
|
|
46 |
parent: 5: |
|
|
45 | parent: 4:909a3d1d3ee1 | |
|
46 | parent: 5:f56d4c64ab98 | |
|
47 | 47 | user: test |
|
48 |
date: |
|
|
48 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
49 | 49 | summary: 6 |
|
50 | 50 | |
|
51 | 51 | (the rawcommit command is deprecated) |
|
52 | 52 | d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a |
|
53 | 53 | 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c |
|
54 |
changeset: 7: |
|
|
54 | changeset: 7:2c11b55105cb | |
|
55 | 55 | tag: tip |
|
56 | 56 | user: test |
|
57 |
date: |
|
|
57 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
58 | 58 | summary: 7 |
|
59 | 59 |
@@ -4,10 +4,10 b' hg init a' | |||
|
4 | 4 | cd a |
|
5 | 5 | echo a > foo |
|
6 | 6 | hg add foo |
|
7 | hg commit -m 1 -d "0 0" | |
|
7 | hg commit -m 1 -d "1000000 0" | |
|
8 | 8 | rm foo |
|
9 | 9 | hg remove foo |
|
10 | hg commit -m 2 -d "0 0" | |
|
10 | hg commit -m 2 -d "1000000 0" | |
|
11 | 11 | hg export 0 |
|
12 | 12 | hg export 1 |
|
13 | 13 | hg log -p -r 0 |
@@ -1,45 +1,45 b'' | |||
|
1 | 1 | # HG changeset patch |
|
2 | 2 | # User test |
|
3 | # Node ID b51ca55c20354097ca299529d18b5cd356976ba2 | |
|
3 | # Node ID 8ba83d44753d6259db5ce6524974dd1174e90f47 | |
|
4 | 4 | # Parent 0000000000000000000000000000000000000000 |
|
5 | 5 | 1 |
|
6 | 6 | |
|
7 |
diff -r 000000000000 -r |
|
|
7 | diff -r 000000000000 -r 8ba83d44753d foo | |
|
8 | 8 | --- /dev/null Thu Jan 1 00:00:00 1970 +0000 |
|
9 |
+++ b/foo |
|
|
9 | +++ b/foo Mon Jan 12 13:46:40 1970 +0000 | |
|
10 | 10 | @@ -0,0 +1,1 @@ |
|
11 | 11 | +a |
|
12 | 12 | # HG changeset patch |
|
13 | 13 | # User test |
|
14 | # Node ID 451c12a24e5a7336921b8d93e280837d7c2b4fc1 | |
|
15 | # Parent b51ca55c20354097ca299529d18b5cd356976ba2 | |
|
14 | # Node ID a1fce69c50d97881c5c014ab23f580f720c78678 | |
|
15 | # Parent 8ba83d44753d6259db5ce6524974dd1174e90f47 | |
|
16 | 16 | 2 |
|
17 | 17 | |
|
18 | diff -r b51ca55c2035 -r 451c12a24e5a foo | |
|
19 |
--- a/foo |
|
|
18 | diff -r 8ba83d44753d -r a1fce69c50d9 foo | |
|
19 | --- a/foo Mon Jan 12 13:46:40 1970 +0000 | |
|
20 | 20 | +++ /dev/null Thu Jan 1 00:00:00 1970 +0000 |
|
21 | 21 | @@ -1,1 +0,0 @@ |
|
22 | 22 | -a |
|
23 |
changeset: 0: |
|
|
23 | changeset: 0:8ba83d44753d | |
|
24 | 24 | user: test |
|
25 |
date: |
|
|
25 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
26 | 26 | summary: 1 |
|
27 | 27 | |
|
28 |
diff -r 000000000000 -r |
|
|
28 | diff -r 000000000000 -r 8ba83d44753d foo | |
|
29 | 29 | --- /dev/null Thu Jan 1 00:00:00 1970 +0000 |
|
30 |
+++ b/foo |
|
|
30 | +++ b/foo Mon Jan 12 13:46:40 1970 +0000 | |
|
31 | 31 | @@ -0,0 +1,1 @@ |
|
32 | 32 | +a |
|
33 | 33 | |
|
34 | 34 | |
|
35 | changeset: 1:451c12a24e5a | |
|
35 | changeset: 1:a1fce69c50d9 | |
|
36 | 36 | tag: tip |
|
37 | 37 | user: test |
|
38 |
date: |
|
|
38 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
39 | 39 | summary: 2 |
|
40 | 40 | |
|
41 | diff -r b51ca55c2035 -r 451c12a24e5a foo | |
|
42 |
--- a/foo |
|
|
41 | diff -r 8ba83d44753d -r a1fce69c50d9 foo | |
|
42 | --- a/foo Mon Jan 12 13:46:40 1970 +0000 | |
|
43 | 43 | +++ /dev/null Thu Jan 1 00:00:00 1970 +0000 |
|
44 | 44 | @@ -1,1 +0,0 @@ |
|
45 | 45 | -a |
@@ -8,7 +8,7 b' echo d1/a1 > d1/d11/a1' | |||
|
8 | 8 | echo d1/b > d1/b |
|
9 | 9 | echo d2/b > d2/b |
|
10 | 10 | hg add d1/a d1/b d1/ba d1/d11/a1 d2/b |
|
11 | hg commit -m "1" -d "0 0" | |
|
11 | hg commit -m "1" -d "1000000 0" | |
|
12 | 12 | |
|
13 | 13 | echo "# rename a single file" |
|
14 | 14 | hg rename d1/d11/a1 d2/c |
@@ -4,7 +4,7 b' hg init' | |||
|
4 | 4 | echo 123 > a |
|
5 | 5 | echo 123 > c |
|
6 | 6 | hg add a c |
|
7 | hg commit -m "first" -d "0 0" a c | |
|
7 | hg commit -m "first" -d "1000000 0" a c | |
|
8 | 8 | echo 123 > b |
|
9 | 9 | echo %% should show b unknown |
|
10 | 10 | hg status |
@@ -5,11 +5,11 b' touch unknown' | |||
|
5 | 5 | |
|
6 | 6 | touch a |
|
7 | 7 | hg add a |
|
8 | hg ci -m "1" -d "0 0" | |
|
8 | hg ci -m "1" -d "1000000 0" | |
|
9 | 9 | |
|
10 | 10 | touch b |
|
11 | 11 | hg add b |
|
12 | hg ci -m "2" -d "0 0" | |
|
12 | hg ci -m "2" -d "1000000 0" | |
|
13 | 13 | |
|
14 | 14 | echo %% Should show unknown |
|
15 | 15 | hg status |
@@ -26,7 +26,7 b' echo "# creating \'remote\'"' | |||
|
26 | 26 | hg init remote |
|
27 | 27 | cd remote |
|
28 | 28 | echo this > foo |
|
29 | hg ci -A -m "init" -d "0 0" foo | |
|
29 | hg ci -A -m "init" -d "1000000 0" foo | |
|
30 | 30 | |
|
31 | 31 | cd .. |
|
32 | 32 | |
@@ -43,7 +43,7 b' hg pull -e ../dummyssh' | |||
|
43 | 43 | |
|
44 | 44 | echo "# local change" |
|
45 | 45 | echo bleah > foo |
|
46 | hg ci -m "add" -d "0 0" | |
|
46 | hg ci -m "add" -d "1000000 0" | |
|
47 | 47 | |
|
48 | 48 | echo "# updating rc" |
|
49 | 49 | echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc |
@@ -20,10 +20,10 b' no changes found' | |||
|
20 | 20 | # updating rc |
|
21 | 21 | # find outgoing |
|
22 | 22 | searching for changes |
|
23 |
changeset: 1: |
|
|
23 | changeset: 1:c54836a570be | |
|
24 | 24 | tag: tip |
|
25 | 25 | user: test |
|
26 |
date: |
|
|
26 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
27 | 27 | summary: add |
|
28 | 28 | |
|
29 | 29 | # push |
@@ -34,10 +34,10 b' remote: adding manifests' | |||
|
34 | 34 | remote: adding file changes |
|
35 | 35 | remote: added 1 changesets with 1 changes to 1 files |
|
36 | 36 | # check remote tip |
|
37 |
changeset: 1: |
|
|
37 | changeset: 1:c54836a570be | |
|
38 | 38 | tag: tip |
|
39 | 39 | user: test |
|
40 |
date: |
|
|
40 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
41 | 41 | summary: add |
|
42 | 42 | |
|
43 | 43 | checking changesets |
@@ -27,7 +27,7 b' cd remote' | |||
|
27 | 27 | hg init |
|
28 | 28 | echo foo > bar |
|
29 | 29 | hg add bar |
|
30 | hg commit -m"test" -d"0 0" | |
|
30 | hg commit -m"test" -d "1000000 0" | |
|
31 | 31 | hg tip |
|
32 | 32 | |
|
33 | 33 | cd .. |
@@ -1,10 +1,10 b'' | |||
|
1 | 1 | 255 |
|
2 | 2 | abort: Connection refused |
|
3 | 3 | ls: copy: No such file or directory |
|
4 |
changeset: 0: |
|
|
4 | changeset: 0:53e17d176ae6 | |
|
5 | 5 | tag: tip |
|
6 | 6 | user: test |
|
7 |
date: |
|
|
7 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
8 | 8 | summary: test |
|
9 | 9 | |
|
10 | 10 | requesting all changes |
@@ -22,7 +22,7 b' hg init repo2' | |||
|
22 | 22 | cd repo2 |
|
23 | 23 | touch modified removed deleted ignored |
|
24 | 24 | echo "ignored" > .hgignore |
|
25 | hg ci -A -m 'initial checkin' -d "0 0" | |
|
25 | hg ci -A -m 'initial checkin' -d "1000000 0" | |
|
26 | 26 | sleep 1 # make sure mtime is changed |
|
27 | 27 | touch modified added unknown ignored |
|
28 | 28 | hg add added |
@@ -3,18 +3,18 b'' | |||
|
3 | 3 | hg init |
|
4 | 4 | echo a > a |
|
5 | 5 | hg add a |
|
6 | hg commit -m "test" -d "0 0" | |
|
6 | hg commit -m "test" -d "1000000 0" | |
|
7 | 7 | hg history |
|
8 | hg tag -d "0 0" "bleah" | |
|
8 | hg tag -d "1000000 0" "bleah" | |
|
9 | 9 | hg history |
|
10 | 10 | |
|
11 | 11 | echo foo >> .hgtags |
|
12 | hg tag -d "0 0" "bleah2" || echo "failed" | |
|
13 | hg tag -d "0 0" -r 0 "bleah2" 1 || echo "failed" | |
|
12 | hg tag -d "1000000 0" "bleah2" || echo "failed" | |
|
13 | hg tag -d "1000000 0" -r 0 "bleah2" 1 || echo "failed" | |
|
14 | 14 | |
|
15 | 15 | hg revert .hgtags |
|
16 | hg tag -d "0 0" -r 0 "bleah0" | |
|
17 | hg tag -l -d "0 0" "bleah1" 1 | |
|
16 | hg tag -d "1000000 0" -r 0 "bleah0" | |
|
17 | hg tag -l -d "1000000 0" "bleah1" 1 | |
|
18 | 18 | |
|
19 | 19 | cat .hgtags |
|
20 | 20 | cat .hg/localtags |
@@ -1,19 +1,19 b'' | |||
|
1 |
changeset: 0: |
|
|
1 | changeset: 0:0acdaf898367 | |
|
2 | 2 | tag: tip |
|
3 | 3 | user: test |
|
4 |
date: |
|
|
4 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
5 | 5 | summary: test |
|
6 | 6 | |
|
7 |
changeset: 1: |
|
|
7 | changeset: 1:c5c60883086f | |
|
8 | 8 | tag: tip |
|
9 | 9 | user: test |
|
10 |
date: |
|
|
11 |
summary: Added tag bleah for changeset |
|
|
10 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
11 | summary: Added tag bleah for changeset 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 | |
|
12 | 12 | |
|
13 |
changeset: 0: |
|
|
13 | changeset: 0:0acdaf898367 | |
|
14 | 14 | tag: bleah |
|
15 | 15 | user: test |
|
16 |
date: |
|
|
16 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
17 | 17 | summary: test |
|
18 | 18 | |
|
19 | 19 | abort: working copy of .hgtags is changed (please commit .hgtags manually) |
@@ -22,8 +22,8 b" use of 'hg tag NAME [REV]' is deprecated" | |||
|
22 | 22 | abort: use only one form to specify the revision |
|
23 | 23 | failed |
|
24 | 24 | use of 'hg tag NAME [REV]' is deprecated, please use 'hg tag [-r REV] NAME' instead |
|
25 | acb14030fe0a21b60322c440ad2d20cf7685a376 bleah | |
|
26 | acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0 | |
|
27 | 863197ef03781c4fc00276d83eb66c4cb9cd91df bleah1 | |
|
25 | 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah | |
|
26 | 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah0 | |
|
27 | c5c60883086f5526bd3e36814b94a73a4e75e172 bleah1 | |
|
28 | 28 | abort: '\n' cannot be used in a tag name |
|
29 | 29 | abort: ':' cannot be used in a tag name |
@@ -6,14 +6,14 b' hg init' | |||
|
6 | 6 | hg id |
|
7 | 7 | echo a > a |
|
8 | 8 | hg add a |
|
9 | hg commit -m "test" -d "0 0" | |
|
9 | hg commit -m "test" -d "1000000 0" | |
|
10 | 10 | hg co |
|
11 | 11 | hg identify |
|
12 | 12 | T=`hg tip -v | head -n 1 | cut -d : -f 3` |
|
13 | 13 | echo "$T first" > .hgtags |
|
14 | 14 | cat .hgtags |
|
15 | 15 | hg add .hgtags |
|
16 | hg commit -m "add tags" -d "0 0" | |
|
16 | hg commit -m "add tags" -d "1000000 0" | |
|
17 | 17 | hg tags |
|
18 | 18 | hg identify |
|
19 | 19 | echo bb > a |
@@ -25,7 +25,7 b' hg -v id' | |||
|
25 | 25 | hg status |
|
26 | 26 | echo 1 > b |
|
27 | 27 | hg add b |
|
28 | hg commit -m "branch" -d "0 0" | |
|
28 | hg commit -m "branch" -d "1000000 0" | |
|
29 | 29 | hg id |
|
30 | 30 | hg co -m 1 |
|
31 | 31 | hg id |
@@ -1,14 +1,14 b'' | |||
|
1 | 1 | unknown |
|
2 | acb14030fe0a tip | |
|
3 | acb14030fe0a21b60322c440ad2d20cf7685a376 first | |
|
4 |
tip 1: |
|
|
5 | first 0:acb14030fe0a21b60322c440ad2d20cf7685a376 | |
|
6 | b9154636be93 tip | |
|
2 | 0acdaf898367 tip | |
|
3 | 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first | |
|
4 | tip 1:8a3ca90d111dc784e6575d373105be12570e8776 | |
|
5 | first 0:0acdaf8983679e0aac16e811534eb49d7ee1f2b4 | |
|
6 | 8a3ca90d111d tip | |
|
7 | 7 | M a |
|
8 | b9154636be93+ tip | |
|
9 | acb14030fe0a+ first | |
|
10 | acb14030fe0a21b60322c440ad2d20cf7685a376+ first | |
|
8 | 8a3ca90d111d+ tip | |
|
9 | 0acdaf898367+ first | |
|
10 | 0acdaf8983679e0aac16e811534eb49d7ee1f2b4+ first | |
|
11 | 11 | M a |
|
12 | c8edf04160c7 tip | |
|
13 | c8edf04160c7+b9154636be93+ tip | |
|
12 | 8216907a933d tip | |
|
13 | 8216907a933d+8a3ca90d111d+ tip | |
|
14 | 14 | M .hgtags |
@@ -5,7 +5,7 b' cd t' | |||
|
5 | 5 | hg init |
|
6 | 6 | echo a > a |
|
7 | 7 | hg add a |
|
8 | hg commit -m "test" -d "0 0" | |
|
8 | hg commit -m "test" -d "1000000 0" | |
|
9 | 9 | hg verify |
|
10 | 10 | hg parents |
|
11 | 11 | hg status |
@@ -3,10 +3,10 b' checking manifests' | |||
|
3 | 3 | crosschecking files in changesets and manifests |
|
4 | 4 | checking files |
|
5 | 5 | 1 files, 1 changesets, 1 total revisions |
|
6 |
changeset: 0: |
|
|
6 | changeset: 0:0acdaf898367 | |
|
7 | 7 | tag: tip |
|
8 | 8 | user: test |
|
9 |
date: |
|
|
9 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
10 | 10 | summary: test |
|
11 | 11 | |
|
12 | 12 | rolling back last transaction |
@@ -5,7 +5,7 b' cd a' | |||
|
5 | 5 | hg init |
|
6 | 6 | echo 123 > a |
|
7 | 7 | hg add a |
|
8 | hg commit -m "a" -u a -d "0 0" | |
|
8 | hg commit -m "a" -u a -d "1000000 0" | |
|
9 | 9 | |
|
10 | 10 | cd .. |
|
11 | 11 | mkdir b |
@@ -13,7 +13,7 b' cd b' | |||
|
13 | 13 | hg init |
|
14 | 14 | echo 321 > b |
|
15 | 15 | hg add b |
|
16 | hg commit -m "b" -u b -d "0 0" | |
|
16 | hg commit -m "b" -u b -d "1000000 0" | |
|
17 | 17 | |
|
18 | 18 | hg pull ../a |
|
19 | 19 | hg heads |
@@ -6,14 +6,14 b' adding manifests' | |||
|
6 | 6 | adding file changes |
|
7 | 7 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
8 | 8 | (run 'hg update' to get a working copy) |
|
9 | changeset: 1:9a79c33a9db3 | |
|
9 | changeset: 1:bdcee5d51fa6 | |
|
10 | 10 | tag: tip |
|
11 | 11 | user: a |
|
12 |
date: |
|
|
12 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
13 | 13 | summary: a |
|
14 | 14 | |
|
15 |
changeset: 0: |
|
|
15 | changeset: 0:f155ba1aa5ba | |
|
16 | 16 | user: b |
|
17 |
date: |
|
|
17 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
18 | 18 | summary: b |
|
19 | 19 |
@@ -6,7 +6,7 b' cd r1' | |||
|
6 | 6 | hg init |
|
7 | 7 | echo a > a |
|
8 | 8 | hg addremove |
|
9 | hg commit -m "1" -d "0 0" | |
|
9 | hg commit -m "1" -d "1000000 0" | |
|
10 | 10 | |
|
11 | 11 | hg clone . ../r2 |
|
12 | 12 | cd ../r2 |
@@ -19,7 +19,7 b' cd ../r1' | |||
|
19 | 19 | echo b > b |
|
20 | 20 | echo a2 > a |
|
21 | 21 | hg addremove |
|
22 | hg commit -m "2" -d "0 0" | |
|
22 | hg commit -m "2" -d "1000000 0" | |
|
23 | 23 | |
|
24 | 24 | cd ../r2 |
|
25 | 25 | hg -q pull ../r1 |
@@ -43,7 +43,7 b' hg up 0' | |||
|
43 | 43 | echo b2 > b |
|
44 | 44 | echo a3 > a |
|
45 | 45 | hg addremove |
|
46 | hg commit -m "3" -d "0 0" | |
|
46 | hg commit -m "3" -d "1000000 0" | |
|
47 | 47 | |
|
48 | 48 | cd ../r2 |
|
49 | 49 | hg -q pull ../r1 |
@@ -1,5 +1,5 b'' | |||
|
1 | 1 | adding a |
|
2 | diff -r c19d34741b0a a | |
|
2 | diff -r 33aaa84a386b a | |
|
3 | 3 | --- a/a |
|
4 | 4 | +++ b/a |
|
5 | 5 | @@ -1,1 +1,1 @@ a |
@@ -7,9 +7,9 b' diff -r c19d34741b0a a' | |||
|
7 | 7 | +abc |
|
8 | 8 | adding b |
|
9 | 9 | M a |
|
10 |
changeset: 0: |
|
|
10 | changeset: 0:33aaa84a386b | |
|
11 | 11 | user: test |
|
12 |
date: |
|
|
12 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
13 | 13 | summary: 1 |
|
14 | 14 | |
|
15 | 15 | resolving manifests |
@@ -22,10 +22,10 b' merging a' | |||
|
22 | 22 | resolving a |
|
23 | 23 | file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 |
|
24 | 24 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
25 | changeset: 1:1e71731e6fbb | |
|
25 | changeset: 1:802f095af299 | |
|
26 | 26 | tag: tip |
|
27 | 27 | user: test |
|
28 |
date: |
|
|
28 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
29 | 29 | summary: 2 |
|
30 | 30 | |
|
31 | 31 | resolving manifests |
@@ -34,16 +34,16 b' resolving manifests' | |||
|
34 | 34 | remote deleted b |
|
35 | 35 | removing b |
|
36 | 36 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
37 |
changeset: 0: |
|
|
37 | changeset: 0:33aaa84a386b | |
|
38 | 38 | user: test |
|
39 |
date: |
|
|
39 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
40 | 40 | summary: 1 |
|
41 | 41 | |
|
42 | 42 | abort: there is nothing to merge, just use 'hg update' |
|
43 | 43 | failed |
|
44 |
changeset: 0: |
|
|
44 | changeset: 0:33aaa84a386b | |
|
45 | 45 | user: test |
|
46 |
date: |
|
|
46 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
47 | 47 | summary: 1 |
|
48 | 48 | |
|
49 | 49 | resolving manifests |
@@ -56,30 +56,30 b' merging a' | |||
|
56 | 56 | resolving a |
|
57 | 57 | file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 |
|
58 | 58 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
59 | changeset: 1:1e71731e6fbb | |
|
59 | changeset: 1:802f095af299 | |
|
60 | 60 | tag: tip |
|
61 | 61 | user: test |
|
62 |
date: |
|
|
62 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
63 | 63 | summary: 2 |
|
64 | 64 | |
|
65 | changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 | |
|
65 | changeset: 1:802f095af299cde27a85b2f056aef3829870956c | |
|
66 | 66 | tag: tip |
|
67 | 67 | user: test |
|
68 |
date: |
|
|
68 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
69 | 69 | files: a b |
|
70 | 70 | description: |
|
71 | 71 | 2 |
|
72 | 72 | |
|
73 | 73 | |
|
74 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
|
74 | changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1 | |
|
75 | 75 | user: test |
|
76 |
date: |
|
|
76 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
77 | 77 | files: a |
|
78 | 78 | description: |
|
79 | 79 | 1 |
|
80 | 80 | |
|
81 | 81 | |
|
82 | diff -r 1e71731e6fbb a | |
|
82 | diff -r 802f095af299 a | |
|
83 | 83 | --- a/a |
|
84 | 84 | +++ b/a |
|
85 | 85 | @@ -1,1 +1,1 @@ a2 |
@@ -87,9 +87,9 b' diff -r 1e71731e6fbb a' | |||
|
87 | 87 | +abc |
|
88 | 88 | adding b |
|
89 | 89 | M a |
|
90 | changeset: 1:1e71731e6fbb | |
|
90 | changeset: 1:802f095af299 | |
|
91 | 91 | user: test |
|
92 |
date: |
|
|
92 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
93 | 93 | summary: 2 |
|
94 | 94 | |
|
95 | 95 | resolving manifests |
@@ -118,19 +118,19 b' resolving b' | |||
|
118 | 118 | file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000 |
|
119 | 119 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
120 | 120 | (branch merge, don't forget to commit) |
|
121 | changeset: 1:1e71731e6fbb | |
|
121 | changeset: 1:802f095af299 | |
|
122 | 122 | user: test |
|
123 |
date: |
|
|
123 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
124 | 124 | summary: 2 |
|
125 | 125 | |
|
126 |
changeset: 2: |
|
|
126 | changeset: 2:030602aee63d | |
|
127 | 127 | tag: tip |
|
128 |
parent: 0: |
|
|
128 | parent: 0:33aaa84a386b | |
|
129 | 129 | user: test |
|
130 |
date: |
|
|
130 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
131 | 131 | summary: 3 |
|
132 | 132 | |
|
133 | diff -r 1e71731e6fbb a | |
|
133 | diff -r 802f095af299 a | |
|
134 | 134 | --- a/a |
|
135 | 135 | +++ b/a |
|
136 | 136 | @@ -1,1 +1,1 @@ a2 |
@@ -3,11 +3,11 b'' | |||
|
3 | 3 | hg init |
|
4 | 4 | touch a |
|
5 | 5 | hg add a |
|
6 | hg commit -m "Added a" -d "0 0" | |
|
6 | hg commit -m "Added a" -d "1000000 0" | |
|
7 | 7 | |
|
8 | 8 | touch main |
|
9 | 9 | hg add main |
|
10 | hg commit -m "Added main" -d "0 0" | |
|
10 | hg commit -m "Added main" -d "1000000 0" | |
|
11 | 11 | hg checkout 0 |
|
12 | 12 | |
|
13 | 13 | echo Main should be gone |
@@ -15,10 +15,10 b' ls' | |||
|
15 | 15 | |
|
16 | 16 | touch side1 |
|
17 | 17 | hg add side1 |
|
18 | hg commit -m "Added side1" -d "0 0" | |
|
18 | hg commit -m "Added side1" -d "1000000 0" | |
|
19 | 19 | touch side2 |
|
20 | 20 | hg add side2 |
|
21 | hg commit -m "Added side2" -d "0 0" | |
|
21 | hg commit -m "Added side2" -d "1000000 0" | |
|
22 | 22 | |
|
23 | 23 | hg log |
|
24 | 24 |
@@ -1,37 +1,37 b'' | |||
|
1 | 1 | Main should be gone |
|
2 | 2 | a |
|
3 |
changeset: 3: |
|
|
3 | changeset: 3:ded32b0db104 | |
|
4 | 4 | tag: tip |
|
5 | 5 | user: test |
|
6 |
date: |
|
|
6 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
7 | 7 | summary: Added side2 |
|
8 | 8 | |
|
9 |
changeset: 2: |
|
|
10 |
parent: 0: |
|
|
9 | changeset: 2:92a816cea698 | |
|
10 | parent: 0:537353581d3d | |
|
11 | 11 | user: test |
|
12 |
date: |
|
|
12 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
13 | 13 | summary: Added side1 |
|
14 | 14 | |
|
15 |
changeset: 1: |
|
|
15 | changeset: 1:221226fb2bd8 | |
|
16 | 16 | user: test |
|
17 |
date: |
|
|
17 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
18 | 18 | summary: Added main |
|
19 | 19 | |
|
20 |
changeset: 0: |
|
|
20 | changeset: 0:537353581d3d | |
|
21 | 21 | user: test |
|
22 |
date: |
|
|
22 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
23 | 23 | summary: Added a |
|
24 | 24 | |
|
25 | 25 | Should have two heads, side2 and main |
|
26 |
changeset: 3: |
|
|
26 | changeset: 3:ded32b0db104 | |
|
27 | 27 | tag: tip |
|
28 | 28 | user: test |
|
29 |
date: |
|
|
29 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
30 | 30 | summary: Added side2 |
|
31 | 31 | |
|
32 |
changeset: 1: |
|
|
32 | changeset: 1:221226fb2bd8 | |
|
33 | 33 | user: test |
|
34 |
date: |
|
|
34 | date: Mon Jan 12 13:46:40 1970 +0000 | |
|
35 | 35 | summary: Added main |
|
36 | 36 | |
|
37 | 37 | Should show a side1 side2 |
General Comments 0
You need to be logged in to leave comments.
Login now