Mercurial > evolve
changeset 6080:8cc7732a29bf
tests: fix copypaste errors in single-head-obsolescence tests
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 10 Nov 2021 20:28:02 +0300 |
| parents | 26ddbaa12ab4 |
| children | 221a2563b02f |
| files | tests/test-single-head-obsolescence-named-branch-A1.t tests/test-single-head-obsolescence-named-branch-A2.t tests/test-single-head-obsolescence-named-branch-A3.t tests/test-single-head-obsolescence-named-branch-A4.t tests/test-single-head-obsolescence-named-branch-A5.t tests/test-single-head-obsolescence-topic-B1.t tests/test-single-head-obsolescence-topic-B2.t tests/test-single-head-obsolescence-topic-B3.t tests/test-single-head-obsolescence-topic-B4.t tests/test-single-head-obsolescence-topic-B5.t |
| diffstat | 10 files changed, 62 insertions(+), 68 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-single-head-obsolescence-named-branch-A1.t Wed Oct 27 13:29:22 2021 +0530 +++ b/tests/test-single-head-obsolescence-named-branch-A1.t Wed Nov 10 20:28:02 2021 +0300 @@ -14,13 +14,13 @@ .. old-state: .. -.. * 2 changeset changeset on branch default -.. * 2 changeset changeset on branch Z on top of them. +.. * 2 changesets on branch default +.. * 2 changesets on branch Z on top of them. .. .. new-state: .. -.. * 2 changeset changeset on branch Z at the same location -.. * 2 changeset changeset on branch default superseding the other ones +.. * 2 changesets on branch Z at the same location +.. * 2 changesets on branch default superseding the other ones .. .. expected-result: .. @@ -70,11 +70,11 @@ created new head (consider using topic for lightweight branches. See 'hg help topic') $ mkcommit B1 - $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` + $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` 1 new obsolescence markers obsoleted 1 changesets 3 new orphan changesets - $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` + $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-single-head-obsolescence-named-branch-A2.t Wed Oct 27 13:29:22 2021 +0530 +++ b/tests/test-single-head-obsolescence-named-branch-A2.t Wed Nov 10 20:28:02 2021 +0300 @@ -1,4 +1,3 @@ - ========================================= Testing single head enforcement: Case A-2 ========================================= @@ -15,14 +14,14 @@ .. old-state: .. -.. * 2 changeset changeset on branch default -.. * 2 changeset changeset on branch Z on top of them. +.. * 2 changesets on branch default +.. * 2 changesets on branch Z on top of them. .. .. new-state: .. -.. * 2 changeset changeset on branch Z at the same location -.. * 1 changeset changeset on branch default unchanged -.. * 1 changeset changeset on branch default superseding the other ones +.. * 2 changesets on branch Z at the same location +.. * 1 changeset on branch default unchanged +.. * 1 changeset on branch default superseding the other ones .. .. expected-result: .. @@ -71,7 +70,7 @@ $ mkcommit B1 created new head (consider using topic for lightweight branches. See 'hg help topic') - $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` + $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` 1 new obsolescence markers obsoleted 1 changesets 2 new orphan changesets
--- a/tests/test-single-head-obsolescence-named-branch-A3.t Wed Oct 27 13:29:22 2021 +0530 +++ b/tests/test-single-head-obsolescence-named-branch-A3.t Wed Nov 10 20:28:02 2021 +0300 @@ -10,17 +10,17 @@ This case is part of a series of tests checking this behavior. Category A: Involving obsolescence -TestCase 3: Full supersedig of a branch interleaved with another +TestCase 3: Full superseding of a branch interleaved with another .. old-state: .. -.. * 2 changeset changeset on branch default -.. * 2 changeset changeset on branch Z interleaved with the other +.. * 2 changesets on branch default +.. * 2 changesets on branch Z interleaved with the other .. .. new-state: .. -.. * 2 changeset changeset on branch Z at the same location -.. * 2 changeset changeset on branch default superseding the other ones +.. * 2 changesets on branch Z at the same location +.. * 2 changesets on branch default superseding the other ones .. .. expected-result: .. @@ -78,11 +78,11 @@ created new head (consider using topic for lightweight branches. See 'hg help topic') $ mkcommit C1 - $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` + $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` 1 new obsolescence markers obsoleted 1 changesets 3 new orphan changesets - $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` + $ hg debugobsolete `getid "desc(C0)"` `getid "desc(C1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-single-head-obsolescence-named-branch-A4.t Wed Oct 27 13:29:22 2021 +0530 +++ b/tests/test-single-head-obsolescence-named-branch-A4.t Wed Nov 10 20:28:02 2021 +0300 @@ -14,12 +14,12 @@ .. old-state: .. -.. * 2 changeset changeset on branch default -.. * 2 changeset changeset on branch Z interleaved with the other one +.. * 2 changesets on branch default +.. * 2 changesets on branch Z interleaved with the other one .. .. new-state: .. -.. * 2 changeset changeset on branch Z at the same location +.. * 2 changesets on branch Z at the same location .. * 1 changeset on default untouched (the lower one) .. * 1 changeset on default moved on the other one .. @@ -78,7 +78,7 @@ $ mkcommit C1 created new head (consider using topic for lightweight branches. See 'hg help topic') - $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` + $ hg debugobsolete `getid "desc(C0)"` `getid "desc(C1)"` 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets
--- a/tests/test-single-head-obsolescence-named-branch-A5.t Wed Oct 27 13:29:22 2021 +0530 +++ b/tests/test-single-head-obsolescence-named-branch-A5.t Wed Nov 10 20:28:02 2021 +0300 @@ -1,5 +1,5 @@ ========================================= -Testing single head enforcement: Case A-1 +Testing single head enforcement: Case A-5 ========================================= A repository is set to only accept a single head per name (typically named @@ -10,16 +10,16 @@ This case is part of a series of tests checking this behavior. Category A: Involving obsolescence -TestCase 1: obsoleting a merge reveal two heads +TestCase 5: Obsoleting a merge reveals two heads .. old-state: .. -.. * 3 changeset changeset on branch default (2 on their own branch + 1 merge) +.. * 3 changesets on branch default (2 on their own branch + 1 merge) .. * 1 changeset on branch Z (children of the merge) .. .. new-state: .. -.. * 2 changeset changeset on branch default (merge is obsolete) each a head +.. * 2 changesets on branch default (merge is obsolete) each a head .. * 1 changeset on branch Z keeping the merge visible .. .. expected-result: @@ -28,8 +28,6 @@ .. .. graph-summary: .. -.. D ● (branch Z) -.. | .. C ● (branch Z) .. | .. M ⊗
--- a/tests/test-single-head-obsolescence-topic-B1.t Wed Oct 27 13:29:22 2021 +0530 +++ b/tests/test-single-head-obsolescence-topic-B1.t Wed Nov 10 20:28:02 2021 +0300 @@ -1,5 +1,5 @@ ========================================= -Testing single head enforcement: Case A-1 +Testing single head enforcement: Case B-1 ========================================= A repository is set to only accept a single head per name (typically named @@ -9,18 +9,18 @@ This case is part of a series of tests checking this behavior. -Category B: Involving obsolescence and topic +Category B: Involving obsolescence with topic TestCase 1: A fully obsolete topic kept visible by another one. .. old-state: .. -.. * 2 changeset changeset on topic X -.. * 2 changeset changeset on topic Y on top of them. +.. * 2 changesets on topic X +.. * 2 changesets on topic Y on top of them. .. .. new-state: .. -.. * 2 changeset changeset on topic Y at the same location -.. * 2 changeset changeset on topic X superseding the other ones +.. * 2 changesets on topic Y at the same location +.. * 2 changesets on topic X superseding the other ones .. .. expected-result: .. @@ -76,11 +76,11 @@ marked working directory as topic: topic-X $ mkcommit A1 $ mkcommit B1 - $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` + $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` 1 new obsolescence markers obsoleted 1 changesets 3 new orphan changesets - $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` + $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-single-head-obsolescence-topic-B2.t Wed Oct 27 13:29:22 2021 +0530 +++ b/tests/test-single-head-obsolescence-topic-B2.t Wed Nov 10 20:28:02 2021 +0300 @@ -1,6 +1,5 @@ - ========================================= -Testing single head enforcement: Case A-2 +Testing single head enforcement: Case B-2 ========================================= A repository is set to only accept a single head per name (typically named @@ -15,14 +14,14 @@ .. old-state: .. -.. * 2 changeset changeset on topic X -.. * 2 changeset changeset on topic Y on top of them. +.. * 2 changesets on topic X +.. * 2 changesets on topic Y on top of them. .. .. new-state: .. -.. * 2 changeset changeset on topic Y at the same location -.. * 1 changeset changeset on topic X unchanged -.. * 1 changeset changeset on topic X superseding the other ones +.. * 2 changesets on topic Y at the same location +.. * 1 changeset on topic X unchanged +.. * 1 changeset on topic X superseding the other ones .. .. expected-result: .. @@ -79,7 +78,7 @@ $ hg topic topic-X marked working directory as topic: topic-X $ mkcommit B1 - $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` + $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` 1 new obsolescence markers obsoleted 1 changesets 2 new orphan changesets
--- a/tests/test-single-head-obsolescence-topic-B3.t Wed Oct 27 13:29:22 2021 +0530 +++ b/tests/test-single-head-obsolescence-topic-B3.t Wed Nov 10 20:28:02 2021 +0300 @@ -1,5 +1,5 @@ ========================================= -Testing single head enforcement: Case A-3 +Testing single head enforcement: Case B-3 ========================================= A repository is set to only accept a single head per name (typically named @@ -10,17 +10,17 @@ This case is part of a series of tests checking this behavior. Category B: Involving obsolescence with topic -TestCase 3: Full supersedig of a branch interleaved with another +TestCase 3: Full superseding of a branch interleaved with another .. old-state: .. -.. * 2 changeset changeset on topic Y -.. * 2 changeset changeset on topic X interleaved with the other +.. * 2 changesets on topic Y +.. * 2 changesets on topic X interleaved with the other .. .. new-state: .. -.. * 2 changeset changeset on topic X at the same location -.. * 2 changeset changeset on topic Y superseding the other ones +.. * 2 changesets on topic X at the same location +.. * 2 changesets on topic Y superseding the other ones .. .. expected-result: .. @@ -78,11 +78,11 @@ marked working directory as topic: topic-X $ mkcommit A1 $ mkcommit C1 - $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` + $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` 1 new obsolescence markers obsoleted 1 changesets 3 new orphan changesets - $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` + $ hg debugobsolete `getid "desc(C0)"` `getid "desc(C1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden
--- a/tests/test-single-head-obsolescence-topic-B4.t Wed Oct 27 13:29:22 2021 +0530 +++ b/tests/test-single-head-obsolescence-topic-B4.t Wed Nov 10 20:28:02 2021 +0300 @@ -1,5 +1,5 @@ ========================================= -Testing single head enforcement: Case A-4 +Testing single head enforcement: Case B-4 ========================================= A repository is set to only accept a single head per name (typically named @@ -9,17 +9,17 @@ This case is part of a series of tests checking this behavior. -Category A: Involving obsolescence +Category B: Involving obsolescence with topic TestCase 4: Partial rewrite of a branch to dis-interleave it .. old-state: .. -.. * 2 changeset changeset on topic X -.. * 2 changeset changeset on topic Y interleaved with the other one +.. * 2 changesets on topic X +.. * 2 changesets on topic Y interleaved with the other one .. .. new-state: .. -.. * 2 changeset changeset on topic Y at the same location +.. * 2 changesets on topic Y at the same location .. * 1 changeset on topic X untouched (the lower one) .. * 1 changeset on topic X moved on the other one .. @@ -78,7 +78,7 @@ 0 files updated, 0 files merged, 3 files removed, 0 files unresolved $ hg topic topic-X $ mkcommit C1 - $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` + $ hg debugobsolete `getid "desc(C0)"` `getid "desc(C1)"` 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets
--- a/tests/test-single-head-obsolescence-topic-B5.t Wed Oct 27 13:29:22 2021 +0530 +++ b/tests/test-single-head-obsolescence-topic-B5.t Wed Nov 10 20:28:02 2021 +0300 @@ -1,5 +1,5 @@ ========================================= -Testing single head enforcement: Case A-1 +Testing single head enforcement: Case B-5 ========================================= A repository is set to only accept a single head per name (typically named @@ -9,17 +9,17 @@ This case is part of a series of tests checking this behavior. -Category A: Involving obsolescence -TestCase 1: obsoleting a merge reveal two heads +Category B: Involving obsolescence with topic +TestCase 5: Obsoleting a merge reveals two heads .. old-state: .. -.. * 3 changeset changeset on topic X (2 on their own branch + 1 merge) -.. * 1 changeset on topic Y (children of the merge) +.. * 3 changesets on topic X (2 on their own branch + 1 merge) +.. * 1 changeset on topic Y (child of the merge) .. .. new-state: .. -.. * 2 changeset changeset on topic X (merge is obsolete) each a head +.. * 2 changesets on topic X (merge is obsolete) each a head .. * 1 changeset on topic Y keeping the merge visible .. .. expected-result: @@ -28,8 +28,6 @@ .. .. graph-summary: .. -.. D ● (topic-Y) -.. | .. C ● (topic-Y) .. | .. M ⊗ (topic-X)