Mercurial > evolve
comparison tests/test-push-checkheads-multibranches-E2.t @ 6315:ebc2dea354a2
tests: switch to double//slash branch in many tests
We want to make sure cases with double slash in branch name will continue to be
handled correctly, and for that we need more tests that use unusual branch
names like this.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sun, 30 Oct 2022 15:22:16 +0400 |
parents | 11c359b4071d |
children | 60daa7887c49 |
comparison
equal
deleted
inserted
replaced
6235:318b81560f8c | 6315:ebc2dea354a2 |
---|---|
12 TestCase 8: moving interleaved branch away from each other | 12 TestCase 8: moving interleaved branch away from each other |
13 | 13 |
14 .. old-state: | 14 .. old-state: |
15 .. | 15 .. |
16 .. * 2-changeset on branch default | 16 .. * 2-changeset on branch default |
17 .. * 1-changeset on branch Z (between the two other) | 17 .. * 1-changeset on branch double//slash (between the two other) |
18 .. | 18 .. |
19 .. new-state: | 19 .. new-state: |
20 .. | 20 .. |
21 .. * 2-changeset on branch default, aligned | 21 .. * 2-changeset on branch default, aligned |
22 .. * 1-changeset on branch Z (at the same location) | 22 .. * 1-changeset on branch double//slash (at the same location) |
23 .. | 23 .. |
24 .. expected-result: | 24 .. expected-result: |
25 .. | 25 .. |
26 .. * push allowed | 26 .. * push allowed |
27 .. | 27 .. |
46 $ setuprepos | 46 $ setuprepos |
47 creating basic server and client repo | 47 creating basic server and client repo |
48 updating to branch default | 48 updating to branch default |
49 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 49 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
50 $ cd client | 50 $ cd client |
51 $ hg branch Z | 51 $ hg branch double//slash |
52 marked working directory as branch Z | 52 marked working directory as branch double//slash |
53 (branches are permanent and global, did you want a bookmark?) | 53 (branches are permanent and global, did you want a bookmark?) |
54 $ mkcommit B0 | 54 $ mkcommit B0 |
55 $ hg branch default --force | 55 $ hg branch default --force |
56 marked working directory as branch default | 56 marked working directory as branch default |
57 $ mkcommit C0 | 57 $ mkcommit C0 |
80 $ hg log -G --hidden | 80 $ hg log -G --hidden |
81 @ 0c76bc104656 (draft): C1 | 81 @ 0c76bc104656 (draft): C1 |
82 | | 82 | |
83 o f6082bc4ffef (draft): A1 | 83 o f6082bc4ffef (draft): A1 |
84 | | 84 | |
85 | x afc55ba2ce61 (draft): C0 | 85 | x c7f1f02ffefc (draft): C0 |
86 | | | 86 | | |
87 | * 93e5c1321ece (draft): B0 | 87 | * 1fd532b11e77 (draft): B0 |
88 | | | 88 | | |
89 | x 8aaa48160adc (draft): A0 | 89 | x 8aaa48160adc (draft): A0 |
90 |/ | 90 |/ |
91 o 1e4be0697311 (public): root | 91 o 1e4be0697311 (public): root |
92 | 92 |