Mercurial > evolve

comparison tests/test-obsolete.t @ 1607:3c7f98753e37 mercurial-3.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: register expected difference for Mercurial 3.4
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 04 Feb 2016 11:01:35 +0000
parents 083220acba01
children 9b1bec442496
comparison
equal deleted inserted replaced
1599:dcf145d0ce21 1607:3c7f98753e37
182 searching for changes 182 searching for changes
183 adding changesets 183 adding changesets
184 adding manifests 184 adding manifests
185 adding file changes 185 adding file changes
186 added 5 changesets with 5 changes to 5 files (+1 heads) 186 added 5 changesets with 5 changes to 5 files (+1 heads)
187 2 new obsolescence markers 187 pushing 2 obsolescence markers (13? bytes) (glob)
188 2 obsolescence markers added
188 $ hg -R ../other-new verify 189 $ hg -R ../other-new verify
189 checking changesets 190 checking changesets
190 checking manifests 191 checking manifests
191 crosschecking files in changesets and manifests 192 crosschecking files in changesets and manifests
192 checking files 193 checking files
236 searching for changes 237 searching for changes
237 adding changesets 238 adding changesets
238 adding manifests 239 adding manifests
239 adding file changes 240 adding file changes
240 added 1 changesets with 1 changes to 1 files (+1 heads) 241 added 1 changesets with 1 changes to 1 files (+1 heads)
241 1 new obsolescence markers 242 pushing 3 obsolescence markers (19? bytes) (glob)
243 1 obsolescence markers added
242 $ qlog -R ../other-new 244 $ qlog -R ../other-new
243 5 245 5
244 - 95de7fc6918d 246 - 95de7fc6918d
245 3 247 3
246 - 725c380fe99b 248 - 725c380fe99b
258 260
259 $ hg push ../other-new 261 $ hg push ../other-new
260 pushing to ../other-new 262 pushing to ../other-new
261 searching for changes 263 searching for changes
262 no changes found 264 no changes found
265 pushing 3 obsolescence markers (19? bytes) (glob)
266 0 obsolescence markers added
263 [1] 267 [1]
264 268
265 $ hg up --hidden -q .^ # 3 269 $ hg up --hidden -q .^ # 3
266 working directory parent is obsolete! 270 working directory parent is obsolete!
267 $ mkcommit "obsol_d'" # 7 271 $ mkcommit "obsol_d'" # 7
273 searching for changes 277 searching for changes
274 adding changesets 278 adding changesets
275 adding manifests 279 adding manifests
276 adding file changes 280 adding file changes
277 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 281 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
278 1 new obsolescence markers 282 pull obsolescence markers
279 (run 'hg heads .' to see heads, 'hg merge' to merge) 283 1 obsolescence markers added
284 (run 'hg heads' to see heads, 'hg merge' to merge)
280 $ qlog -R ../other-new 285 $ qlog -R ../other-new
281 6 286 6
282 - 909a0fb57e5d 287 - 909a0fb57e5d
283 3 288 3
284 - 725c380fe99b 289 - 725c380fe99b
363 searching for changes 368 searching for changes
364 adding changesets 369 adding changesets
365 adding manifests 370 adding manifests
366 adding file changes 371 adding file changes
367 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 372 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
368 1 new obsolescence markers 373 pull obsolescence markers
369 (run 'hg heads .' to see heads, 'hg merge' to merge) 374 1 obsolescence markers added
375 (run 'hg heads' to see heads, 'hg merge' to merge)
370 376
371 $ hg up -q 7 # to check rollback update behavior 377 $ hg up -q 7 # to check rollback update behavior
372 $ qlog 378 $ qlog
373 7 379 7
374 - 159dfc9fa5d3 380 - 159dfc9fa5d3
387 parent: 3:725c380fe99b 393 parent: 3:725c380fe99b
388 add obsol_c' 394 add obsol_c'
389 branch: default 395 branch: default
390 commit: 1 deleted, 2 unknown (clean) 396 commit: 1 deleted, 2 unknown (clean)
391 update: 2 new changesets, 2 branch heads (merge) 397 update: 2 new changesets, 2 branch heads (merge)
392 phases: 4 draft
393 unstable: 1 changesets 398 unstable: 1 changesets
394 $ qlog 399 $ qlog
395 6 400 6
396 - 909a0fb57e5d 401 - 909a0fb57e5d
397 3 402 3
537 searching for changes 542 searching for changes
538 adding changesets 543 adding changesets
539 adding manifests 544 adding manifests
540 adding file changes 545 adding file changes
541 added 2 changesets with 1 changes to [12] files (re) 546 added 2 changesets with 1 changes to [12] files (re)
542 3 new obsolescence markers 547 pushing 7 obsolescence markers (49? bytes) (glob)
548 3 obsolescence markers added
543 $ hg up -q 10 549 $ hg up -q 10
544 $ mkcommit "obsol_d'''" 550 $ mkcommit "obsol_d'''"
545 created new head 551 created new head
546 $ hg debugobsolete `getid 11` `getid 12` 552 $ hg debugobsolete `getid 11` `getid 12`
547 $ hg push ../other-new --traceback 553 $ hg push ../other-new --traceback
549 searching for changes 555 searching for changes
550 adding changesets 556 adding changesets
551 adding manifests 557 adding manifests
552 adding file changes 558 adding file changes
553 added 1 changesets with 1 changes to 1 files (+1 heads) 559 added 1 changesets with 1 changes to 1 files (+1 heads)
554 1 new obsolescence markers 560 pushing 8 obsolescence markers (55? bytes) (glob)
561 1 obsolescence markers added
555 $ cd .. 562 $ cd ..
556 563
557 check bumped detection 564 check bumped detection
558 (make an obsolete changeset public) 565 (make an obsolete changeset public)
559 566
661 parent: 1[46]:50f11e5e3a63 tip (re) 668 parent: 1[46]:50f11e5e3a63 tip (re)
662 add obsolet_conflicting_d 669 add obsolet_conflicting_d
663 branch: default 670 branch: default
664 commit: (clean) 671 commit: (clean)
665 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) 672 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
666 phases: 3 draft
667 bumped: 1 changesets 673 bumped: 1 changesets
668 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` 674 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
669 $ hg log -r 'divergent()' 675 $ hg log -r 'divergent()'
670 changeset: 12:6db5e282cb91 676 changeset: 12:6db5e282cb91
671 parent: 10:2033b4e49474 677 parent: 10:2033b4e49474