Mercurial > evolve
comparison tests/test-single-head-obsolescence-topic-B3.t @ 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 | 144d10e74757 |
| children | d1a6d83a7109 |
comparison
equal
deleted
inserted
replaced
| 6078:26ddbaa12ab4 | 6080:8cc7732a29bf |
|---|---|
| 1 ========================================= | 1 ========================================= |
| 2 Testing single head enforcement: Case A-3 | 2 Testing single head enforcement: Case B-3 |
| 3 ========================================= | 3 ========================================= |
| 4 | 4 |
| 5 A repository is set to only accept a single head per name (typically named | 5 A repository is set to only accept a single head per name (typically named |
| 6 branch). However, obsolete changesets can make this enforcement more | 6 branch). However, obsolete changesets can make this enforcement more |
| 7 complicated, because they can be kept visible by other changeset on other | 7 complicated, because they can be kept visible by other changeset on other |
| 8 branch. | 8 branch. |
| 9 | 9 |
| 10 This case is part of a series of tests checking this behavior. | 10 This case is part of a series of tests checking this behavior. |
| 11 | 11 |
| 12 Category B: Involving obsolescence with topic | 12 Category B: Involving obsolescence with topic |
| 13 TestCase 3: Full supersedig of a branch interleaved with another | 13 TestCase 3: Full superseding of a branch interleaved with another |
| 14 | 14 |
| 15 .. old-state: | 15 .. old-state: |
| 16 .. | 16 .. |
| 17 .. * 2 changeset changeset on topic Y | 17 .. * 2 changesets on topic Y |
| 18 .. * 2 changeset changeset on topic X interleaved with the other | 18 .. * 2 changesets on topic X interleaved with the other |
| 19 .. | 19 .. |
| 20 .. new-state: | 20 .. new-state: |
| 21 .. | 21 .. |
| 22 .. * 2 changeset changeset on topic X at the same location | 22 .. * 2 changesets on topic X at the same location |
| 23 .. * 2 changeset changeset on topic Y superseding the other ones | 23 .. * 2 changesets on topic Y superseding the other ones |
| 24 .. | 24 .. |
| 25 .. expected-result: | 25 .. expected-result: |
| 26 .. | 26 .. |
| 27 .. * only one head detected | 27 .. * only one head detected |
| 28 .. | 28 .. |
| 76 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | 76 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
| 77 $ hg topic topic-X | 77 $ hg topic topic-X |
| 78 marked working directory as topic: topic-X | 78 marked working directory as topic: topic-X |
| 79 $ mkcommit A1 | 79 $ mkcommit A1 |
| 80 $ mkcommit C1 | 80 $ mkcommit C1 |
| 81 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` | 81 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` |
| 82 1 new obsolescence markers | 82 1 new obsolescence markers |
| 83 obsoleted 1 changesets | 83 obsoleted 1 changesets |
| 84 3 new orphan changesets | 84 3 new orphan changesets |
| 85 $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` | 85 $ hg debugobsolete `getid "desc(C0)"` `getid "desc(C1)"` |
| 86 1 new obsolescence markers | 86 1 new obsolescence markers |
| 87 obsoleted 1 changesets | 87 obsoleted 1 changesets |
| 88 $ hg log -G --hidden | 88 $ hg log -G --hidden |
| 89 @ 9f6e6381b9aa [default:topic-X] (draft): C1 | 89 @ 9f6e6381b9aa [default:topic-X] (draft): C1 |
| 90 | | 90 | |