Mercurial > evolve
annotate tests/test-push-checkheads-multi-topics-F1.t @ 6934:dd518437d4e0 stable
tests: introduce a compat-branches blacklist file
The idea behind this file is to have an easy and obvious mechanism for skipping
some tests on compatibility branches without modifying the test files
themselves or touching .gitlab-ci.yml.
Obviously, each compatibility branch can have different set of tests, and so
the contents of this file can be different on different branches.
This concept had actually existed in core for a long time, see
tests/blacklists/ directory.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 16 Nov 2024 17:59:53 +0400 |
parents | 1eb543272657 |
children | b1d010b2e6c4 9da0114a8a02 |
rev | line source |
---|---|
5224
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 ==================================== |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 Testing head checking code: Case E-1 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 ==================================== |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 Mercurial checks for the introduction of new heads on push. Evolution comes |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
6 into play to detect if existing branches on the server are being replaced by |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
7 some of the new one we push. |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
9 This case is part of a series of tests checking this behavior. |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 Category F: case involving changeset on multiple topic |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 TestCase 1: moving a branch to another location |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 .. old-state: |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
15 .. |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
16 .. * 1-changeset on topic Y |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
17 .. * 1-changeset on topic Z (above Y) |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
18 .. |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
19 .. new-state: |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
20 .. |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
21 .. * 1-changeset on topic Y |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
22 .. * 1-changeset on topic Z (rebased away from A0) |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
23 .. |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
24 .. expected-result: |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
25 .. |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
26 .. * push allowed |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
27 .. |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
28 .. graph-summary: |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
29 .. |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
30 .. B ø⇠◔ B' topic Z |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
31 .. | | |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
32 .. A ◔ | topic Y |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
33 .. |/ |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
34 .. ● |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
35 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
36 $ . $TESTDIR/testlib/topic_setup.sh |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
37 $ . $TESTDIR/testlib/push-checkheads-util.sh |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
38 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
39 Test setup |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
40 ---------- |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
41 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
42 $ mkdir E1 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
43 $ cd E1 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
44 $ setuprepos |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
45 creating basic server and client repo |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
46 updating to branch default |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
47 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
48 $ cd client |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
49 $ hg topic -r . Y |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
50 switching to topic Y |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
51 changed topic on 1 changesets to "Y" |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
52 $ hg topic Z |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
53 $ mkcommit B0 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
54 active topic 'Z' grew its first changeset |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
55 (see 'hg help topics' for more information) |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
56 $ hg push |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
57 pushing to $TESTTMP/E1/server |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
58 searching for changes |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
59 adding changesets |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
60 adding manifests |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
61 adding file changes |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
62 added 2 changesets with 1 changes to 2 files (+1 heads) |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
63 1 new obsolescence markers |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
64 obsoleted 1 changesets |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
65 $ hg up 0 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
66 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
67 $ hg topic Z |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
68 marked working directory as topic: Z |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
69 $ mkcommit B1 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
70 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
71 1 new obsolescence markers |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
72 obsoleted 1 changesets |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
73 $ hg log -G --hidden |
6267
1eb543272657
topic: switch to the short fqbn format by default
Anton Shestakov <av6@dwimlabs.net>
parents:
6260
diff
changeset
|
74 @ 845eeb768064 [default//Z] (draft): B1 |
5224
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
75 | |
6267
1eb543272657
topic: switch to the short fqbn format by default
Anton Shestakov <av6@dwimlabs.net>
parents:
6260
diff
changeset
|
76 | x e1494106e1ca [default//Z] (draft): B0 |
5224
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
77 | | |
6267
1eb543272657
topic: switch to the short fqbn format by default
Anton Shestakov <av6@dwimlabs.net>
parents:
6260
diff
changeset
|
78 | o f5cd873e2965 [default//Y] (draft): A0 |
5224
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
79 |/ |
6259
fc60328270ac
tests: add branch to checkheads-related log output
Anton Shestakov <av6@dwimlabs.net>
parents:
5224
diff
changeset
|
80 | x 8aaa48160adc [default] (draft): A0 |
5224
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
81 |/ |
6259
fc60328270ac
tests: add branch to checkheads-related log output
Anton Shestakov <av6@dwimlabs.net>
parents:
5224
diff
changeset
|
82 o 1e4be0697311 [default] (public): root |
5224
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
83 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
84 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
85 Actual testing |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
86 -------------- |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
87 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
88 $ hg push |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
89 pushing to $TESTTMP/E1/server |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
90 searching for changes |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
91 adding changesets |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
92 adding manifests |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
93 adding file changes |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
94 added 1 changesets with 1 changes to 1 files (+1 heads) |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
95 1 new obsolescence markers |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
96 obsoleted 1 changesets |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
97 |
5a46f156c9b7
head-checking: add test variants with topics
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
98 $ cd ../.. |