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