# HG changeset patch # User Pierre-Yves David # Date 1490960548 -7200 # Node ID 2f71f6234b0661c6cb6ea8e740eeb36dadb2f0b5 # Parent 2b4e2e93b7dbe9e308fa5fc19bcc02c57b522dbd checkheads-tests: add missing parents recording for prune markers It is a bit too easy to forget about theses :/ If they are missing, the markers are not going to be exchanged on push. diff -r 2b4e2e93b7db -r 2f71f6234b06 tests/test-checkheads-partial-C3.t --- a/tests/test-checkheads-partial-C3.t Wed Mar 29 14:02:46 2017 +0200 +++ b/tests/test-checkheads-partial-C3.t Fri Mar 31 13:42:28 2017 +0200 @@ -56,7 +56,7 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit C0 created new head - $ hg debugobsolete `getid "desc(B0)"` + $ hg debugobsolete --record-parents `getid "desc(B0)"` $ hg log -G --hidden @ 0f88766e02d6 (draft): C0 | diff -r 2b4e2e93b7db -r 2f71f6234b06 tests/test-checkheads-partial-C4.t --- a/tests/test-checkheads-partial-C4.t Wed Mar 29 14:02:46 2017 +0200 +++ b/tests/test-checkheads-partial-C4.t Fri Mar 31 13:42:28 2017 +0200 @@ -56,7 +56,7 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit C0 created new head - $ hg debugobsolete `getid "desc(A0)"` + $ hg debugobsolete --record-parents `getid "desc(A0)"` $ hg log -G --hidden @ 0f88766e02d6 (draft): C0 | diff -r 2b4e2e93b7db -r 2f71f6234b06 tests/test-checkheads-pruned-B1.t --- a/tests/test-checkheads-pruned-B1.t Wed Mar 29 14:02:46 2017 +0200 +++ b/tests/test-checkheads-pruned-B1.t Fri Mar 31 13:42:28 2017 +0200 @@ -46,7 +46,7 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B0 created new head - $ hg debugobsolete `getid "desc(A0)"` + $ hg debugobsolete --record-parents `getid "desc(A0)"` $ hg log -G --hidden @ 74ff5441d343 (draft): B0 | @@ -65,6 +65,7 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) + 1 new obsolescence markers diff -r 2b4e2e93b7db -r 2f71f6234b06 tests/test-checkheads-pruned-B2.t --- a/tests/test-checkheads-pruned-B2.t Wed Mar 29 14:02:46 2017 +0200 +++ b/tests/test-checkheads-pruned-B2.t Fri Mar 31 13:42:28 2017 +0200 @@ -57,7 +57,7 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - $ hg debugobsolete `getid "desc(B0)"` + $ hg debugobsolete --record-parents `getid "desc(B0)"` $ hg log -G --hidden @ f6082bc4ffef (draft): A1 | @@ -78,5 +78,5 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - 1 new obsolescence markers + 2 new obsolescence markers diff -r 2b4e2e93b7db -r 2f71f6234b06 tests/test-checkheads-pruned-B3.t --- a/tests/test-checkheads-pruned-B3.t Wed Mar 29 14:02:46 2017 +0200 +++ b/tests/test-checkheads-pruned-B3.t Fri Mar 31 13:42:28 2017 +0200 @@ -56,7 +56,7 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B1 created new head - $ hg debugobsolete `getid "desc(A0)"` + $ hg debugobsolete --record-parents `getid "desc(A0)"` $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` $ hg log -G --hidden @ 25c56d33e4c4 (draft): B1 @@ -78,5 +78,5 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - 1 new obsolescence markers + 2 new obsolescence markers diff -r 2b4e2e93b7db -r 2f71f6234b06 tests/test-checkheads-pruned-B4.t --- a/tests/test-checkheads-pruned-B4.t Wed Mar 29 14:02:46 2017 +0200 +++ b/tests/test-checkheads-pruned-B4.t Fri Mar 31 13:42:28 2017 +0200 @@ -57,8 +57,8 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit C0 created new head - $ hg debugobsolete `getid "desc(A0)"` - $ hg debugobsolete `getid "desc(B0)"` + $ hg debugobsolete --record-parents `getid "desc(A0)"` + $ hg debugobsolete --record-parents `getid "desc(B0)"` $ hg log -G --hidden @ 0f88766e02d6 (draft): C0 | @@ -79,4 +79,5 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) + 2 new obsolescence markers diff -r 2b4e2e93b7db -r 2f71f6234b06 tests/test-checkheads-pruned-B5.t --- a/tests/test-checkheads-pruned-B5.t Wed Mar 29 14:02:46 2017 +0200 +++ b/tests/test-checkheads-pruned-B5.t Fri Mar 31 13:42:28 2017 +0200 @@ -60,9 +60,9 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B1 created new head - $ hg debugobsolete `getid "desc(A0)"` + $ hg debugobsolete --record-parents `getid "desc(A0)"` $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` - $ hg debugobsolete `getid "desc(C0)"` + $ hg debugobsolete --record-parents `getid "desc(C0)"` $ hg log -G --hidden @ 25c56d33e4c4 (draft): B1 | @@ -85,5 +85,5 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - 1 new obsolescence markers + 3 new obsolescence markers diff -r 2b4e2e93b7db -r 2f71f6234b06 tests/test-checkheads-pruned-B8.t --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-checkheads-pruned-B8.t Fri Mar 31 13:42:28 2017 +0200 @@ -0,0 +1,95 @@ +==================================== +Testing head checking code: Case B-2 +==================================== + +Mercurial checks for the introduction of multiple heads on push. Evolution +comes into play to detect if existing heads on the server are being replaced by +some of the new heads we push. + +This test file is part of a series of tests checking this behavior. + +Category B: checking simple case involving pruned changesets +TestCase 2: multi-changeset branch, head is pruned, rest is superceeded, through other + +.. old-state: +.. +.. * 2 changeset branch +.. +.. new-state: +.. +.. * old head is rewritten then pruned +.. * 1 new branch succeeding to the other changeset in the old branch (through another obsolete branch) +.. +.. expected-result: +.. +.. * push allowed +.. +.. graph-summary: +.. +.. B ø⇠⊗ B' +.. | | A' +.. A ø⇠ø⇠◔ A'' +.. |/ / +.. | / +.. |/ +.. ○ + + $ . $TESTDIR/testlib/checkheads-util.sh + +Test setup +---------- + + $ setuprepos + creating basic server and client repo + updating to branch default + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd server + $ mkcommit B0 + $ cd ../client + $ hg pull + pulling from $TESTTMP/server + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files + (run 'hg update' to get a working copy) + $ hg up 0 + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ mkcommit A1 + created new head + $ mkcommit B1 + $ hg up 0 + 0 files updated, 0 files merged, 2 files removed, 0 files unresolved + $ mkcommit A2 + created new head + $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` + $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` + $ hg debugobsolete `getid "desc(B1)"` + $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` + $ hg log -G --hidden + @ c1f8d089020f (draft): A2 + | + | x 262c8c798096 (draft): B1 + | | + | x f6082bc4ffef (draft): A1 + |/ + | x d73caddc5533 (draft): B0 + | | + | x 8aaa48160adc (draft): A0 + |/ + o 1e4be0697311 (public): root + + +Actual testing +-------------- + + $ hg push + pushing to $TESTTMP/server + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) + 2 new obsolescence markers + diff -r 2b4e2e93b7db -r 2f71f6234b06 tests/test-checkheads-superceed-A6.t --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-checkheads-superceed-A6.t Fri Mar 31 13:42:28 2017 +0200 @@ -0,0 +1,95 @@ +==================================== +Testing head checking code: Case A-6 +==================================== + +Mercurial checks for the introduction of multiple heads on push. Evolution +comes into play to detect if existing heads on the server are being replaced by +some of the new heads we push. + +This test file is part of a series of tests checking this behavior. + +Category A: checking simple case invoving a branch being superceeded by another. +TestCase 6: multi-changeset branch, split on multiple other, (base on its own branch) + +.. old-state: +.. +.. * 2 branch (1 changeset, and 2 changesets) +.. +.. new-state: +.. +.. * 1 new branch superceeding the base of the old-2-changesets-branch, +.. * 1 new changesets on the old-1-changeset-branch superceeding the head of the other +.. +.. expected-result: +.. +.. * push allowed +.. +.. graph-summary: +.. +.. B'◔⇢ø B +.. | | +.. A | ø⇠◔ A' +.. | |/ +.. C ● | +.. \| +.. ● + + $ . $TESTDIR/testlib/checkheads-util.sh + +Test setup +---------- + + $ setuprepos + creating basic server and client repo + updating to branch default + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd server + $ mkcommit B0 + $ hg up 0 + 0 files updated, 0 files merged, 2 files removed, 0 files unresolved + $ mkcommit C0 + created new head + $ cd ../client + $ hg pull + pulling from $TESTTMP/server + searching for changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 2 files (+1 heads) + (run 'hg heads' to see heads, 'hg merge' to merge) + $ hg up 0 + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ mkcommit A1 + created new head + $ hg up 'desc(C0)' + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ mkcommit B1 + $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` + $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` + $ hg log -G --hidden + @ d70a1f75a020 (draft): B1 + | + | o f6082bc4ffef (draft): A1 + | | + o | 0f88766e02d6 (draft): C0 + |/ + | x d73caddc5533 (draft): B0 + | | + | x 8aaa48160adc (draft): A0 + |/ + o 1e4be0697311 (public): root + + + +Actual testing +-------------- + + $ hg push + pushing to $TESTTMP/server + searching for changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 2 files (+1 heads) + 2 new obsolescence markers diff -r 2b4e2e93b7db -r 2f71f6234b06 tests/test-checkheads-superceed-A7.t --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-checkheads-superceed-A7.t Fri Mar 31 13:42:28 2017 +0200 @@ -0,0 +1,95 @@ +==================================== +Testing head checking code: Case A-7 +==================================== + +Mercurial checks for the introduction of multiple heads on push. Evolution +comes into play to detect if existing heads on the server are being replaced by +some of the new heads we push. + +This test file is part of a series of tests checking this behavior. + +Category A: checking simple case invoving a branch being superceeded by another. +TestCase 7: multi-changeset branch, split on multiple other, (head on its own branch) + +.. old-state: +.. +.. * 2 branch (1 changeset, and 2 changesets) +.. +.. new-state: +.. +.. * 1 new branch superceeding the head of the old-2-changesets-branch, +.. * 1 new changesets on the old-1-changeset-branch superceeding the base of the other +.. +.. expected-result: +.. +.. * push allowed +.. +.. graph-summary: +.. +.. B ø⇠◔ B' +.. | | +.. A'◔⇢ø | +.. | |/ +.. C ● | +.. \| +.. ● + + $ . $TESTDIR/testlib/checkheads-util.sh + +Test setup +---------- + + $ setuprepos + creating basic server and client repo + updating to branch default + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd server + $ mkcommit B0 + $ hg up 0 + 0 files updated, 0 files merged, 2 files removed, 0 files unresolved + $ mkcommit C0 + created new head + $ cd ../client + $ hg pull + pulling from $TESTTMP/server + searching for changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 2 files (+1 heads) + (run 'hg heads' to see heads, 'hg merge' to merge) + $ hg up 'desc(C0)' + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ mkcommit A1 + $ hg up 0 + 0 files updated, 0 files merged, 2 files removed, 0 files unresolved + $ mkcommit B1 + created new head + $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` + $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` + $ hg log -G --hidden + @ 25c56d33e4c4 (draft): B1 + | + | o a0802eb7fc1b (draft): A1 + | | + | o 0f88766e02d6 (draft): C0 + |/ + | x d73caddc5533 (draft): B0 + | | + | x 8aaa48160adc (draft): A0 + |/ + o 1e4be0697311 (public): root + + + +Actual testing +-------------- + + $ hg push + pushing to $TESTTMP/server + searching for changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 2 files (+1 heads) + 2 new obsolescence markers diff -r 2b4e2e93b7db -r 2f71f6234b06 tests/test-checkheads-unpushed-D2.t --- a/tests/test-checkheads-unpushed-D2.t Wed Mar 29 14:02:46 2017 +0200 +++ b/tests/test-checkheads-unpushed-D2.t Fri Mar 31 13:42:28 2017 +0200 @@ -61,7 +61,7 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - $ hg debugobsolete `getid "desc(B0)"` + $ hg debugobsolete --record-parents `getid "desc(B0)"` $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit C0