Mercurial > evolve

comparison tests/test-push-checkheads-multibranches-E1.t @ 6392:faea18a26188 mercurial-5.9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-6.0 into mercurial-5.9
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 06 Feb 2023 18:56:14 +0400
parents 60daa7887c49
children b1d010b2e6c4
comparison
equal deleted inserted replaced
6346:a159b6195fe3 6392:faea18a26188
12 TestCase 8: moving a branch to another location 12 TestCase 8: moving a branch to another location
13 13
14 .. old-state: 14 .. old-state:
15 .. 15 ..
16 .. * 1-changeset on branch default 16 .. * 1-changeset on branch default
17 .. * 1-changeset on branch Z (above default) 17 .. * 1-changeset on branch double//slash (above default)
18 .. 18 ..
19 .. new-state: 19 .. new-state:
20 .. 20 ..
21 .. * 1-changeset on branch default 21 .. * 1-changeset on branch default
22 .. * 1-changeset on branch Z (rebased away from A0) 22 .. * 1-changeset on branch double//slash (rebased away from A0)
23 .. 23 ..
24 .. expected-result: 24 .. expected-result:
25 .. 25 ..
26 .. * push allowed 26 .. * push allowed
27 .. 27 ..
44 $ setuprepos 44 $ setuprepos
45 creating basic server and client repo 45 creating basic server and client repo
46 updating to branch default 46 updating to branch default
47 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 47 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
48 $ cd client 48 $ cd client
49 $ hg branch Z 49 $ hg branch double//slash
50 marked working directory as branch Z 50 marked working directory as branch double//slash
51 (branches are permanent and global, did you want a bookmark?) 51 (branches are permanent and global, did you want a bookmark?)
52 $ mkcommit B0 52 $ mkcommit B0
53 $ hg push --new-branch 53 $ hg push --new-branch
54 pushing to $TESTTMP/E1/server 54 pushing to $TESTTMP/E1/server
55 searching for changes 55 searching for changes
57 adding manifests 57 adding manifests
58 adding file changes 58 adding file changes
59 added 1 changesets with 1 changes to 1 files 59 added 1 changesets with 1 changes to 1 files
60 $ hg up 0 60 $ hg up 0
61 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 61 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
62 $ hg branch --force Z 62 $ hg branch --force double//slash
63 marked working directory as branch Z 63 marked working directory as branch double//slash
64 $ mkcommit B1 64 $ mkcommit B1
65 created new head 65 created new head
66 (consider using topic for lightweight branches. See 'hg help topic') 66 (consider using topic for lightweight branches. See 'hg help topic')
67 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 67 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
68 1 new obsolescence markers 68 1 new obsolescence markers
69 obsoleted 1 changesets 69 obsoleted 1 changesets
70 $ hg log -G --hidden 70 $ hg log -G --hidden
71 @ c98b855401e7 (draft): B1 71 @ 7f7cd4ea4626 [double//slash] (draft): B1
72 | 72 |
73 | x 93e5c1321ece (draft): B0 73 | x 1fd532b11e77 [double//slash] (draft): B0
74 | | 74 | |
75 | o 8aaa48160adc (draft): A0 75 | o 8aaa48160adc [default] (draft): A0
76 |/ 76 |/
77 o 1e4be0697311 (public): root 77 o 1e4be0697311 [default] (public): root
78 78
79 79
80 Actual testing 80 Actual testing
81 -------------- 81 --------------
82 82