comparison tests/test-topic-flow-publish-flag.t @ 6402:2cd36fe3f4e6 mercurial-4.9

test-compat: merge mercurial-5.0 into mercurial-4.9
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 07 Feb 2023 11:30:34 +0400
parents 1328195f76a9
children
comparison
equal deleted inserted replaced
6356:fb668d6019d4 6402:2cd36fe3f4e6
76 ---------------------------------- 76 ----------------------------------
77 77
78 $ mkcommit c_dE0 78 $ mkcommit c_dE0
79 $ hg update 'desc("c_dD0")' 79 $ hg update 'desc("c_dD0")'
80 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 80 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
81 $ hg branch other 81 $ hg branch double//slash
82 marked working directory as branch other 82 marked working directory as branch double//slash
83 (branches are permanent and global, did you want a bookmark?) 83 (branches are permanent and global, did you want a bookmark?)
84 $ mkcommit c_oF0 84 $ mkcommit c_oF0
85 $ hg push -f --publish 85 $ hg push -f --publish
86 pushing to $TESTTMP/bare-branch-server 86 pushing to $TESTTMP/bare-branch-server
87 searching for changes 87 searching for changes
88 adding changesets 88 adding changesets
89 adding manifests 89 adding manifests
90 adding file changes 90 adding file changes
91 added 2 changesets with 2 changes to 2 files (+1 heads) 91 added 2 changesets with 2 changes to 2 files (+1 heads)
92 $ hg tgl 'all()' 92 $ hg tgl 'all()'
93 @ 6:45b23c834b6a c_oF0 public other 93 @ 6:eb49b8849195 c_oF0 public double//slash
94 | 94 |
95 | o 5:5576ae39eaee c_dE0 public default 95 | o 5:5576ae39eaee c_dE0 public default
96 |/ 96 |/
97 o 4:c63e7dd93a91 c_dD0 public default 97 o 4:c63e7dd93a91 c_dD0 public default
98 | 98 |
114 adding changesets 114 adding changesets
115 adding manifests 115 adding manifests
116 adding file changes 116 adding file changes
117 added 1 changesets with 1 changes to 1 files 117 added 1 changesets with 1 changes to 1 files
118 $ hg tgl 'all()' 118 $ hg tgl 'all()'
119 @ 7:d293f74a1233 c_oG0 draft other 119 @ 7:c0155e8ec55a c_oG0 draft double//slash
120 | 120 |
121 o 6:45b23c834b6a c_oF0 public other 121 o 6:eb49b8849195 c_oF0 public double//slash
122 | 122 |
123 | o 5:5576ae39eaee c_dE0 public default 123 | o 5:5576ae39eaee c_dE0 public default
124 |/ 124 |/
125 o 4:c63e7dd93a91 c_dD0 public default 125 o 4:c63e7dd93a91 c_dD0 public default
126 | 126 |
136 pushing to $TESTTMP/bare-branch-server 136 pushing to $TESTTMP/bare-branch-server
137 searching for changes 137 searching for changes
138 no changes found 138 no changes found
139 [1] 139 [1]
140 $ hg tgl 'all()' 140 $ hg tgl 'all()'
141 @ 7:d293f74a1233 c_oG0 public other 141 @ 7:c0155e8ec55a c_oG0 public double//slash
142 | 142 |
143 o 6:45b23c834b6a c_oF0 public other 143 o 6:eb49b8849195 c_oF0 public double//slash
144 | 144 |
145 | o 5:5576ae39eaee c_dE0 public default 145 | o 5:5576ae39eaee c_dE0 public default
146 |/ 146 |/
147 o 4:c63e7dd93a91 c_dD0 public default 147 o 4:c63e7dd93a91 c_dD0 public default
148 | 148 |
172 $ hg tgl 'all()' 172 $ hg tgl 'all()'
173 @ 9:fbf2be276221 c_dI0 public default 173 @ 9:fbf2be276221 c_dI0 public default
174 | 174 |
175 o 5:5576ae39eaee c_dE0 public default 175 o 5:5576ae39eaee c_dE0 public default
176 | 176 |
177 | o 8:8e85646c135f c_oH0 draft other 177 | o 8:256a2cb64fd8 c_oH0 draft double//slash
178 | | 178 | |
179 | o 7:d293f74a1233 c_oG0 public other 179 | o 7:c0155e8ec55a c_oG0 public double//slash
180 | | 180 | |
181 | o 6:45b23c834b6a c_oF0 public other 181 | o 6:eb49b8849195 c_oF0 public double//slash
182 |/ 182 |/
183 o 4:c63e7dd93a91 c_dD0 public default 183 o 4:c63e7dd93a91 c_dD0 public default
184 | 184 |
185 o 3:7d56a56d2547 c_dC0 public default 185 o 3:7d56a56d2547 c_dC0 public default
186 | 186 |
207 | 207 |
208 o 9:fbf2be276221 c_dI0 public default 208 o 9:fbf2be276221 c_dI0 public default
209 | 209 |
210 o 5:5576ae39eaee c_dE0 public default 210 o 5:5576ae39eaee c_dE0 public default
211 | 211 |
212 | o 8:8e85646c135f c_oH0 draft other 212 | o 8:256a2cb64fd8 c_oH0 draft double//slash
213 | | 213 | |
214 | o 7:d293f74a1233 c_oG0 public other 214 | o 7:c0155e8ec55a c_oG0 public double//slash
215 | | 215 | |
216 | o 6:45b23c834b6a c_oF0 public other 216 | o 6:eb49b8849195 c_oF0 public double//slash
217 |/ 217 |/
218 o 4:c63e7dd93a91 c_dD0 public default 218 o 4:c63e7dd93a91 c_dD0 public default
219 | 219 |
220 o 3:7d56a56d2547 c_dC0 public default 220 o 3:7d56a56d2547 c_dC0 public default
221 | 221 |
235 | 235 |
236 o 9:fbf2be276221 c_dI0 public default 236 o 9:fbf2be276221 c_dI0 public default
237 | 237 |
238 o 5:5576ae39eaee c_dE0 public default 238 o 5:5576ae39eaee c_dE0 public default
239 | 239 |
240 | o 8:8e85646c135f c_oH0 draft other 240 | o 8:256a2cb64fd8 c_oH0 draft double//slash
241 | | 241 | |
242 | o 7:d293f74a1233 c_oG0 public other 242 | o 7:c0155e8ec55a c_oG0 public double//slash
243 | | 243 | |
244 | o 6:45b23c834b6a c_oF0 public other 244 | o 6:eb49b8849195 c_oF0 public double//slash
245 |/ 245 |/
246 o 4:c63e7dd93a91 c_dD0 public default 246 o 4:c63e7dd93a91 c_dD0 public default
247 | 247 |
248 o 3:7d56a56d2547 c_dC0 public default 248 o 3:7d56a56d2547 c_dC0 public default
249 | 249 |
267 | 267 |
268 o 9:fbf2be276221 c_dI0 public default 268 o 9:fbf2be276221 c_dI0 public default
269 | 269 |
270 o 5:5576ae39eaee c_dE0 public default 270 o 5:5576ae39eaee c_dE0 public default
271 | 271 |
272 | o 8:8e85646c135f c_oH0 draft other 272 | o 8:256a2cb64fd8 c_oH0 draft double//slash
273 | | 273 | |
274 | o 7:d293f74a1233 c_oG0 public other 274 | o 7:c0155e8ec55a c_oG0 public double//slash
275 | | 275 | |
276 | o 6:45b23c834b6a c_oF0 public other 276 | o 6:eb49b8849195 c_oF0 public double//slash
277 |/ 277 |/
278 o 4:c63e7dd93a91 c_dD0 public default 278 o 4:c63e7dd93a91 c_dD0 public default
279 | 279 |
280 o 3:7d56a56d2547 c_dC0 public default 280 o 3:7d56a56d2547 c_dC0 public default
281 | 281 |
313 | 313 |
314 o 9:fbf2be276221 c_dI0 public default 314 o 9:fbf2be276221 c_dI0 public default
315 | 315 |
316 o 5:5576ae39eaee c_dE0 public default 316 o 5:5576ae39eaee c_dE0 public default
317 | 317 |
318 | o 8:8e85646c135f c_oH0 draft other 318 | o 8:256a2cb64fd8 c_oH0 draft double//slash
319 | | 319 | |
320 | o 7:d293f74a1233 c_oG0 public other 320 | o 7:c0155e8ec55a c_oG0 public double//slash
321 | | 321 | |
322 | o 6:45b23c834b6a c_oF0 public other 322 | o 6:eb49b8849195 c_oF0 public double//slash
323 |/ 323 |/
324 o 4:c63e7dd93a91 c_dD0 public default 324 o 4:c63e7dd93a91 c_dD0 public default
325 | 325 |
326 o 3:7d56a56d2547 c_dC0 public default 326 o 3:7d56a56d2547 c_dC0 public default
327 | 327 |
367 | 367 |
368 o 9:fbf2be276221 c_dI0 public default 368 o 9:fbf2be276221 c_dI0 public default
369 | 369 |
370 o 5:5576ae39eaee c_dE0 public default 370 o 5:5576ae39eaee c_dE0 public default
371 | 371 |
372 | o 8:8e85646c135f c_oH0 draft other 372 | o 8:256a2cb64fd8 c_oH0 draft double//slash
373 | | 373 | |
374 | o 7:d293f74a1233 c_oG0 public other 374 | o 7:c0155e8ec55a c_oG0 public double//slash
375 | | 375 | |
376 | o 6:45b23c834b6a c_oF0 public other 376 | o 6:eb49b8849195 c_oF0 public double//slash
377 |/ 377 |/
378 o 4:c63e7dd93a91 c_dD0 public default 378 o 4:c63e7dd93a91 c_dD0 public default
379 | 379 |
380 o 3:7d56a56d2547 c_dC0 public default 380 o 3:7d56a56d2547 c_dC0 public default
381 | 381 |
415 | 415 |
416 o 9:fbf2be276221 c_dI0 public default 416 o 9:fbf2be276221 c_dI0 public default
417 | 417 |
418 o 5:5576ae39eaee c_dE0 public default 418 o 5:5576ae39eaee c_dE0 public default
419 | 419 |
420 | o 8:8e85646c135f c_oH0 draft other 420 | o 8:256a2cb64fd8 c_oH0 draft double//slash
421 | | 421 | |
422 | o 7:d293f74a1233 c_oG0 public other 422 | o 7:c0155e8ec55a c_oG0 public double//slash
423 | | 423 | |
424 | o 6:45b23c834b6a c_oF0 public other 424 | o 6:eb49b8849195 c_oF0 public double//slash
425 |/ 425 |/
426 o 4:c63e7dd93a91 c_dD0 public default 426 o 4:c63e7dd93a91 c_dD0 public default
427 | 427 |
428 o 3:7d56a56d2547 c_dC0 public default 428 o 3:7d56a56d2547 c_dC0 public default
429 | 429 |
430 o 2:286d02a6e2a2 c_dB0 public default 430 o 2:286d02a6e2a2 c_dB0 public default
431 | 431 |
432 o 1:134bc3852ad2 c_dA0 public default 432 o 1:134bc3852ad2 c_dA0 public default
433 | 433 |
434 o 0:ea207398892e ROOT public default 434 o 0:ea207398892e ROOT public default
435 435
436
437 checking branch format in branchcache on disk
438 ---------------------------------------------
439
440 $ cd $TESTTMP/bare-client/.hg/cache/
441 $ grep double branch2* | sort
442 branch2-base:* o double//slash (glob)
443 branch2-immutable:* o double//slash (glob)
444 branch2-served:* o double//slash (glob)
445
446 $ cd $TESTTMP/bare-branch-server/.hg/cache/
447 $ grep double branch2* | sort
448 branch2-base:* o double//slash (glob)
449 branch2-immutable:* o double//slash (glob)
450 branch2-served:* o double//slash (glob)