comparison tests/test-topic-flow-publish-bare.t @ 6381:60daa7887c49

branching: merge test changes from before topic namespaces
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 31 Jan 2023 13:33:28 +0400
parents a2855aff1268 eac8880c145e
children 567cc86f2d01 445240ccb701
comparison
equal deleted inserted replaced
6380:130ad27064bc 6381:60daa7887c49
93 pushing something not on default 93 pushing something not on default
94 -------------------------------- 94 --------------------------------
95 95
96 $ hg update 'desc("ROOT")' 96 $ hg update 'desc("ROOT")'
97 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 97 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
98 $ hg branch branchA 98 $ hg branch double//slash
99 marked working directory as branch branchA 99 marked working directory as branch double//slash
100 (branches are permanent and global, did you want a bookmark?) 100 (branches are permanent and global, did you want a bookmark?)
101 $ mkcommit c_aE0 101 $ mkcommit c_aE0
102 $ hg push --new-branch 102 $ hg push --new-branch
103 pushing to $TESTTMP/bare-branch-server 103 pushing to $TESTTMP/bare-branch-server
104 1 changesets about to be published 104 1 changesets about to be published
106 adding changesets 106 adding changesets
107 adding manifests 107 adding manifests
108 adding file changes 108 adding file changes
109 added 1 changesets with 1 changes to 1 files (+1 heads) 109 added 1 changesets with 1 changes to 1 files (+1 heads)
110 $ hg tgl 'all()' 110 $ hg tgl 'all()'
111 @ 5:0db08e758601 c_aE0 public branchA 111 @ 5:ffb83c22f2ce c_aE0 public double//slash
112 | 112 |
113 | o 4:9bf953aa81f6 c_dD0 public default 113 | o 4:9bf953aa81f6 c_dD0 public default
114 | | 114 | |
115 | | o 3:9d5b8e1f08a4 c_dC0 public default 115 | | o 3:9d5b8e1f08a4 c_dC0 public default
116 | |/ 116 | |/
147 |/ 147 |/
148 | o 2:286d02a6e2a2 c_dB0 public default 148 | o 2:286d02a6e2a2 c_dB0 public default
149 |/ 149 |/
150 o 1:134bc3852ad2 c_dA0 public default 150 o 1:134bc3852ad2 c_dA0 public default
151 | 151 |
152 | o 5:0db08e758601 c_aE0 public branchA 152 | o 5:ffb83c22f2ce c_aE0 public double//slash
153 |/ 153 |/
154 o 0:ea207398892e ROOT public default 154 o 0:ea207398892e ROOT public default
155 155
156 156
157 pushing topic over a bare branch 157 pushing topic over a bare branch
186 | | 186 | |
187 | o 4:9bf953aa81f6 c_dD0 public default 187 | o 4:9bf953aa81f6 c_dD0 public default
188 |/ 188 |/
189 o 1:134bc3852ad2 c_dA0 public default 189 o 1:134bc3852ad2 c_dA0 public default
190 | 190 |
191 | o 5:0db08e758601 c_aE0 public branchA 191 | o 5:ffb83c22f2ce c_aE0 public double//slash
192 |/ 192 |/
193 o 0:ea207398892e ROOT public default 193 o 0:ea207398892e ROOT public default
194 194
195 195
196 Pushing topic in between bare branch 196 Pushing topic in between bare branch
213 adding changesets 213 adding changesets
214 adding manifests 214 adding manifests
215 adding file changes 215 adding file changes
216 added 3 changesets with 3 changes to 3 files 216 added 3 changesets with 3 changes to 3 files
217 $ hg tgl 'all()' 217 $ hg tgl 'all()'
218 @ 11:b0a00ebdfd24 c_aK0 public branchA 218 @ 11:a6836f5ce4fe c_aK0 public double//slash
219 | 219 |
220 o 5:0db08e758601 c_aE0 public branchA 220 o 5:ffb83c22f2ce c_aE0 public double//slash
221 | 221 |
222 | o 10:abb5c84eb9e9 c_dJ0 draft default bar 222 | o 10:abb5c84eb9e9 c_dJ0 draft default bar
223 | | 223 | |
224 | o 8:858be9a8daaf c_dH0 draft default bar 224 | o 8:858be9a8daaf c_dH0 draft default bar
225 | | 225 | |
276 | | 276 | |
277 | o 2:286d02a6e2a2 c_dB0 public default 277 | o 2:286d02a6e2a2 c_dB0 public default
278 |/ 278 |/
279 o 1:134bc3852ad2 c_dA0 public default 279 o 1:134bc3852ad2 c_dA0 public default
280 | 280 |
281 | o 11:b0a00ebdfd24 c_aK0 public branchA 281 | o 11:a6836f5ce4fe c_aK0 public double//slash
282 | | 282 | |
283 | o 5:0db08e758601 c_aE0 public branchA 283 | o 5:ffb83c22f2ce c_aE0 public double//slash
284 |/ 284 |/
285 o 0:ea207398892e ROOT public default 285 o 0:ea207398892e ROOT public default
286 286
287 $ hg tgl 'all()' -R ../bare-branch-server 287 $ hg tgl 'all()' -R ../bare-branch-server
288 o 12:a6f9f8c6c6cc c_dL0 public default 288 o 12:a6f9f8c6c6cc c_dL0 public default
303 | | 303 | |
304 | o 2:286d02a6e2a2 c_dB0 public default 304 | o 2:286d02a6e2a2 c_dB0 public default
305 |/ 305 |/
306 @ 1:134bc3852ad2 c_dA0 public default 306 @ 1:134bc3852ad2 c_dA0 public default
307 | 307 |
308 | o 11:b0a00ebdfd24 c_aK0 public branchA 308 | o 11:a6836f5ce4fe c_aK0 public double//slash
309 | | 309 | |
310 | o 5:0db08e758601 c_aE0 public branchA 310 | o 5:ffb83c22f2ce c_aE0 public double//slash
311 |/ 311 |/
312 o 0:ea207398892e ROOT public default 312 o 0:ea207398892e ROOT public default
313 313
314 314
315 Checking the option to prevent publishing 315 Checking the option to prevent publishing
340 [255] 340 [255]
341 341
342 Checking the option to prevent automatic publishing 342 Checking the option to prevent automatic publishing
343 =================================================== 343 ===================================================
344 344
345 $ hg up branchA 345 $ hg up double//slash//
346 2 files updated, 0 files merged, 5 files removed, 0 files unresolved 346 2 files updated, 0 files merged, 5 files removed, 0 files unresolved
347 347
348 Making sure the topic-publishing mode is announced as a capability 348 Making sure the topic-publishing mode is announced as a capability
349 349
350 $ hg debugcapabilities $TESTTMP/bare-branch-server | grep topics 350 $ hg debugcapabilities $TESTTMP/bare-branch-server | grep topics