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