Mercurial > evolve

comparison tests/test-inhibit.t @ 2929:06844693bb21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update after removing of redundant amend commit Following e8a7c1a0565a, temporary amend commits has been removed impacting all revision numbers in tests including amend operations. Update tests case to use description or hashes when possible and update revisions number when not.
author Boris Feld <boris.feld@octobus.net>
date Fri, 15 Sep 2017 15:48:18 +0200
parents 0eed6678b150
children
comparison
equal deleted inserted replaced
2928:6275808e89ef 2929:06844693bb21
98 after amend 98 after amend
99 99
100 $ echo babar > cJ 100 $ echo babar > cJ
101 $ hg commit --amend 101 $ hg commit --amend
102 $ hg log -G 102 $ hg log -G
103 @ 9:55c73a90e4b4 add cJ 103 @ 8:55c73a90e4b4 add cJ
104 | 104 |
105 o 6:cf5c4f4554ce add cH 105 o 6:cf5c4f4554ce add cH
106 | 106 |
107 o 5:5419eb264a33 add cG 107 o 5:5419eb264a33 add cG
108 | 108 |
110 | 110 |
111 o 0:54ccbc537fc2 add cA 111 o 0:54ccbc537fc2 add cA
112 112
113 $ hg debugobsinhibit --hidden 18214586bf78 113 $ hg debugobsinhibit --hidden 18214586bf78
114 $ hg log -G 114 $ hg log -G
115 @ 9:55c73a90e4b4 add cJ 115 @ 8:55c73a90e4b4 add cJ
116 | 116 |
117 | o 7:18214586bf78 add cJ 117 | o 7:18214586bf78 add cJ
118 |/ 118 |/
119 o 6:cf5c4f4554ce add cH 119 o 6:cf5c4f4554ce add cH
120 | 120 |
126 126
127 127
128 and no divergence 128 and no divergence
129 129
130 $ hg summary 130 $ hg summary
131 parent: 9:55c73a90e4b4 tip 131 parent: 8:55c73a90e4b4 tip
132 add cJ 132 add cJ
133 branch: default 133 branch: default
134 commit: (clean) 134 commit: (clean)
135 update: 1 new changesets, 2 branch heads (merge) 135 update: 1 new changesets, 2 branch heads (merge)
136 phases: 6 draft 136 phases: 6 draft
144 1 changesets pruned 144 1 changesets pruned
145 $ hg debugobsinhibit --hidden 18214586bf78 145 $ hg debugobsinhibit --hidden 18214586bf78
146 $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//' 146 $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
147 20 .hg/store/obsinhibit 147 20 .hg/store/obsinhibit
148 $ hg log -G 148 $ hg log -G
149 @ 9:55c73a90e4b4 add cJ 149 @ 8:55c73a90e4b4 add cJ
150 | 150 |
151 | o 7:18214586bf78 add cJ 151 | o 7:18214586bf78 add cJ
152 |/ 152 |/
153 o 6:cf5c4f4554ce add cH 153 o 6:cf5c4f4554ce add cH
154 | 154 |
158 | 158 |
159 o 0:54ccbc537fc2 add cA 159 o 0:54ccbc537fc2 add cA
160 160
161 $ hg phase --public 7 161 $ hg phase --public 7
162 1 new phase-divergent changesets 162 1 new phase-divergent changesets
163 $ hg strip 9 163 $ hg strip 8
164 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 164 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
165 working directory now at cf5c4f4554ce 165 working directory now at cf5c4f4554ce
166 1 changesets pruned 166 1 changesets pruned
167 $ hg log -G 167 $ hg log -G
168 o 7:18214586bf78 add cJ 168 o 7:18214586bf78 add cJ
177 177
178 $ hg debugobsinhibit --hidden 55c73a90e4b4 178 $ hg debugobsinhibit --hidden 55c73a90e4b4
179 $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//' 179 $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
180 20 .hg/store/obsinhibit 180 20 .hg/store/obsinhibit
181 $ hg log -G 181 $ hg log -G
182 o 9:55c73a90e4b4 add cJ 182 o 8:55c73a90e4b4 add cJ
183 | 183 |
184 | o 7:18214586bf78 add cJ 184 | o 7:18214586bf78 add cJ
185 |/ 185 |/
186 @ 6:cf5c4f4554ce add cH 186 @ 6:cf5c4f4554ce add cH
187 | 187 |
194 Update should inhibit all related unstable commits 194 Update should inhibit all related unstable commits
195 195
196 $ hg update 2 --hidden 196 $ hg update 2 --hidden
197 2 files updated, 0 files merged, 3 files removed, 0 files unresolved 197 2 files updated, 0 files merged, 3 files removed, 0 files unresolved
198 $ hg log -G 198 $ hg log -G
199 o 9:55c73a90e4b4 add cJ 199 o 8:55c73a90e4b4 add cJ
200 | 200 |
201 | o 7:18214586bf78 add cJ 201 | o 7:18214586bf78 add cJ
202 |/ 202 |/
203 o 6:cf5c4f4554ce add cH 203 o 6:cf5c4f4554ce add cH
204 | 204 |
211 | o 1:02bcbc3f6e56 add cB 211 | o 1:02bcbc3f6e56 add cB
212 |/ 212 |/
213 o 0:54ccbc537fc2 add cA 213 o 0:54ccbc537fc2 add cA
214 214
215 215
216 $ hg update 9 216 $ hg update 8
217 4 files updated, 0 files merged, 2 files removed, 0 files unresolved 217 4 files updated, 0 files merged, 2 files removed, 0 files unresolved
218 $ hg log -G 218 $ hg log -G
219 @ 9:55c73a90e4b4 add cJ 219 @ 8:55c73a90e4b4 add cJ
220 | 220 |
221 | o 7:18214586bf78 add cJ 221 | o 7:18214586bf78 add cJ
222 |/ 222 |/
223 o 6:cf5c4f4554ce add cH 223 o 6:cf5c4f4554ce add cH
224 | 224 |
233 o 0:54ccbc537fc2 add cA 233 o 0:54ccbc537fc2 add cA
234 234
235 $ hg strip --hidden 1:: 235 $ hg strip --hidden 1::
236 3 changesets pruned 236 3 changesets pruned
237 $ hg log -G 237 $ hg log -G
238 @ 9:55c73a90e4b4 add cJ 238 @ 8:55c73a90e4b4 add cJ
239 | 239 |
240 | o 7:18214586bf78 add cJ 240 | o 7:18214586bf78 add cJ
241 |/ 241 |/
242 o 6:cf5c4f4554ce add cH 242 o 6:cf5c4f4554ce add cH
243 | 243 |
249 249
250 250
251 Bookmark should inhibit all related unstable commits 251 Bookmark should inhibit all related unstable commits
252 $ hg bookmark -r 2 book1 --hidden 252 $ hg bookmark -r 2 book1 --hidden
253 $ hg log -G 253 $ hg log -G
254 @ 9:55c73a90e4b4 add cJ 254 @ 8:55c73a90e4b4 add cJ
255 | 255 |
256 | o 7:18214586bf78 add cJ 256 | o 7:18214586bf78 add cJ
257 |/ 257 |/
258 o 6:cf5c4f4554ce add cH 258 o 6:cf5c4f4554ce add cH
259 | 259 |
274 $ hg bookmark -r 1 book2 274 $ hg bookmark -r 1 book2
275 $ hg bookmark -D book1 --config experimental.evolution=createmarkers #--config to make sure prune is not registered as a command. 275 $ hg bookmark -D book1 --config experimental.evolution=createmarkers #--config to make sure prune is not registered as a command.
276 bookmark 'book1' deleted 276 bookmark 'book1' deleted
277 1 changesets pruned 277 1 changesets pruned
278 $ hg log -G 278 $ hg log -G
279 @ 9:55c73a90e4b4 add cJ 279 @ 8:55c73a90e4b4 add cJ
280 | 280 |
281 | o 7:18214586bf78 add cJ 281 | o 7:18214586bf78 add cJ
282 |/ 282 |/
283 o 6:cf5c4f4554ce add cH 283 o 6:cf5c4f4554ce add cH
284 | 284 |
292 292
293 $ hg bookmark -D book2 293 $ hg bookmark -D book2
294 bookmark 'book2' deleted 294 bookmark 'book2' deleted
295 1 changesets pruned 295 1 changesets pruned
296 $ hg log -G 296 $ hg log -G
297 @ 9:55c73a90e4b4 add cJ 297 @ 8:55c73a90e4b4 add cJ
298 | 298 |
299 | o 7:18214586bf78 add cJ 299 | o 7:18214586bf78 add cJ
300 |/ 300 |/
301 o 6:cf5c4f4554ce add cH 301 o 6:cf5c4f4554ce add cH
302 | 302 |
395 $ hg update -C 0 395 $ hg update -C 0
396 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 396 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
397 $ mkcommit cK 397 $ mkcommit cK
398 created new head 398 created new head
399 $ mkcommit cL 399 $ mkcommit cL
400 $ hg update -C 9 400 $ hg update -C 8
401 4 files updated, 0 files merged, 2 files removed, 0 files unresolved 401 4 files updated, 0 files merged, 2 files removed, 0 files unresolved
402 $ hg log -G 402 $ hg log -G
403 o 11:53a94305e133 add cL 403 o 10:53a94305e133 add cL
404 | 404 |
405 o 10:ad78ff7d621f add cK 405 o 9:ad78ff7d621f add cK
406 | 406 |
407 | @ 9:55c73a90e4b4 add cJ 407 | @ 8:55c73a90e4b4 add cJ
408 | | 408 | |
409 | | o 7:18214586bf78 add cJ 409 | | o 7:18214586bf78 add cJ
410 | |/ 410 | |/
411 | o 6:cf5c4f4554ce add cH 411 | o 6:cf5c4f4554ce add cH
412 | | 412 | |
414 | | 414 | |
415 | o 4:98065434e5c6 add cE 415 | o 4:98065434e5c6 add cE
416 |/ 416 |/
417 o 0:54ccbc537fc2 add cA 417 o 0:54ccbc537fc2 add cA
418 418
419 $ hg strip --hidden 10: 419 $ hg strip --hidden 9:
420 2 changesets pruned 420 2 changesets pruned
421 $ hg log -G 421 $ hg log -G
422 @ 9:55c73a90e4b4 add cJ 422 @ 8:55c73a90e4b4 add cJ
423 | 423 |
424 | o 7:18214586bf78 add cJ 424 | o 7:18214586bf78 add cJ
425 |/ 425 |/
426 o 6:cf5c4f4554ce add cH 426 o 6:cf5c4f4554ce add cH
427 | 427 |
428 o 5:5419eb264a33 add cG 428 o 5:5419eb264a33 add cG
429 | 429 |
430 o 4:98065434e5c6 add cE 430 o 4:98065434e5c6 add cE
431 | 431 |
432 o 0:54ccbc537fc2 add cA 432 o 0:54ccbc537fc2 add cA
433 433
434 $ hg rebase -s 10 -d 3 434 $ hg rebase -s 9 -d 3
435 abort: hidden revision '10'! 435 abort: hidden revision '9'!
436 (use --hidden to access hidden revisions; pruned) 436 (use --hidden to access hidden revisions; pruned)
437 [255] 437 [255]
438 $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d 2db36d8066ff --config experimental.rebaseskipobsolete=0 438 $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d 2db36d8066ff --config experimental.rebaseskipobsolete=0
439 Warning: accessing hidden changesets ad78ff7d621f,53a94305e133 for write operation 439 Warning: accessing hidden changesets ad78ff7d621f,53a94305e133 for write operation
440 Warning: accessing hidden changesets 2db36d8066ff for write operation 440 Warning: accessing hidden changesets 2db36d8066ff for write operation
441 rebasing 10:ad78ff7d621f "add cK" 441 rebasing 9:ad78ff7d621f "add cK"
442 rebasing 11:53a94305e133 "add cL" 442 rebasing 10:53a94305e133 "add cL" (tip)
443 $ hg log -G 443 $ hg log -G
444 o 13:2f7b7704d714 add cL 444 o 12:2f7b7704d714 add cL
445 | 445 |
446 o 12:fe1634cbe235 add cK 446 o 11:fe1634cbe235 add cK
447 | 447 |
448 | @ 9:55c73a90e4b4 add cJ 448 | @ 8:55c73a90e4b4 add cJ
449 | | 449 | |
450 | | o 7:18214586bf78 add cJ 450 | | o 7:18214586bf78 add cJ
451 | |/ 451 | |/
452 | o 6:cf5c4f4554ce add cH 452 | o 6:cf5c4f4554ce add cH
453 | | 453 | |
474 > EOF 474 > EOF
475 475
476 $ hg strip --hidden 1:: 476 $ hg strip --hidden 1::
477 5 changesets pruned 477 5 changesets pruned
478 $ hg log -G 478 $ hg log -G
479 @ 9:55c73a90e4b4 add cJ 479 @ 8:55c73a90e4b4 add cJ
480 | 480 |
481 | o 7:18214586bf78 add cJ 481 | o 7:18214586bf78 add cJ
482 |/ 482 |/
483 o 6:cf5c4f4554ce add cH 483 o 6:cf5c4f4554ce add cH
484 | 484 |
492 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 492 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
493 $ mkcommit cL 493 $ mkcommit cL
494 $ mkcommit cM 494 $ mkcommit cM
495 $ mkcommit cN 495 $ mkcommit cN
496 $ hg log -G 496 $ hg log -G
497 @ 16:a438c045eb37 add cN 497 @ 15:a438c045eb37 add cN
498 | 498 |
499 o 15:2d66e189f5b5 add cM 499 o 14:2d66e189f5b5 add cM
500 | 500 |
501 o 14:d66ccb8c5871 add cL 501 o 13:d66ccb8c5871 add cL
502 | 502 |
503 | o 9:55c73a90e4b4 add cJ 503 | o 8:55c73a90e4b4 add cJ
504 | | 504 | |
505 o | 7:18214586bf78 add cJ 505 o | 7:18214586bf78 add cJ
506 |/ 506 |/
507 o 6:cf5c4f4554ce add cH 507 o 6:cf5c4f4554ce add cH
508 | 508 |
510 | 510 |
511 o 4:98065434e5c6 add cE 511 o 4:98065434e5c6 add cE
512 | 512 |
513 o 0:54ccbc537fc2 add cA 513 o 0:54ccbc537fc2 add cA
514 514
515 $ hg up 15 515 $ hg up 14
516 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 516 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
517 $ echo "mmm" >> cM 517 $ echo "mmm" >> cM
518 $ hg amend 518 $ hg amend
519 $ hg log -G 519 $ hg log -G
520 @ 18:210589181b14 add cM 520 @ 16:210589181b14 add cM
521 | 521 |
522 | o 16:a438c045eb37 add cN 522 | o 15:a438c045eb37 add cN
523 | | 523 | |
524 | o 15:2d66e189f5b5 add cM 524 | o 14:2d66e189f5b5 add cM
525 |/ 525 |/
526 o 14:d66ccb8c5871 add cL 526 o 13:d66ccb8c5871 add cL
527 | 527 |
528 | o 9:55c73a90e4b4 add cJ 528 | o 8:55c73a90e4b4 add cJ
529 | | 529 | |
530 o | 7:18214586bf78 add cJ 530 o | 7:18214586bf78 add cJ
531 |/ 531 |/
532 o 6:cf5c4f4554ce add cH 532 o 6:cf5c4f4554ce add cH
533 | 533 |
537 | 537 |
538 o 0:54ccbc537fc2 add cA 538 o 0:54ccbc537fc2 add cA
539 539
540 Check that rebasing a commit twice makes the commit visible again 540 Check that rebasing a commit twice makes the commit visible again
541 541
542 $ hg rebase -d 18 -r 16 --keep 542 $ hg rebase -d 16 -r 15 --keep
543 rebasing 16:a438c045eb37 "add cN" 543 rebasing 15:a438c045eb37 "add cN"
544 $ hg log -r 14:: -G 544 $ hg log -r 13:: -G
545 o 19:104eed5354c7 add cN 545 o 17:104eed5354c7 add cN
546 | 546 |
547 @ 18:210589181b14 add cM 547 @ 16:210589181b14 add cM
548 | 548 |
549 | o 16:a438c045eb37 add cN 549 | o 15:a438c045eb37 add cN
550 | | 550 | |
551 | o 15:2d66e189f5b5 add cM 551 | o 14:2d66e189f5b5 add cM
552 |/ 552 |/
553 o 14:d66ccb8c5871 add cL 553 o 13:d66ccb8c5871 add cL
554 | 554 |
555 ~ 555 ~
556 $ hg strip -r 210589181b14 556 $ hg strip -r 210589181b14
557 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 557 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
558 working directory now at d66ccb8c5871 558 working directory now at d66ccb8c5871
559 2 changesets pruned 559 2 changesets pruned
560 560
561 Using a hash prefix solely made of digits should work 561 Using a hash prefix solely made of digits should work
562 $ hg update 210589181 562 $ hg update 210589181
563 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 563 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
564 $ hg rebase -d 18 -r 16 --keep 564 $ hg rebase -d 16 -r 15 --keep
565 rebasing 16:a438c045eb37 "add cN" 565 rebasing 15:a438c045eb37 "add cN"
566 $ hg log -r 14:: -G 566 $ hg log -r 13:: -G
567 o 19:104eed5354c7 add cN 567 o 17:104eed5354c7 add cN
568 | 568 |
569 @ 18:210589181b14 add cM 569 @ 16:210589181b14 add cM
570 | 570 |
571 | o 16:a438c045eb37 add cN 571 | o 15:a438c045eb37 add cN
572 | | 572 | |
573 | o 15:2d66e189f5b5 add cM 573 | o 14:2d66e189f5b5 add cM
574 |/ 574 |/
575 o 14:d66ccb8c5871 add cL 575 o 13:d66ccb8c5871 add cL
576 | 576 |
577 ~ 577 ~
578 578
579 Test prunestrip 579 Test prunestrip
580 580
581 $ hg book foo -r 104eed5354c7 581 $ hg book foo -r 104eed5354c7
582 $ hg strip -r 210589181b14 582 $ hg strip -r 210589181b14
583 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 583 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
584 working directory now at d66ccb8c5871 584 working directory now at d66ccb8c5871
585 2 changesets pruned 585 2 changesets pruned
586 $ hg log -r 14:: -G -T '{rev}:{node|short} {desc|firstline} {bookmarks}\n' 586 $ hg log -r 13:: -G -T '{rev}:{node|short} {desc|firstline} {bookmarks}\n'
587 o 16:a438c045eb37 add cN 587 o 15:a438c045eb37 add cN
588 | 588 |
589 o 15:2d66e189f5b5 add cM 589 o 14:2d66e189f5b5 add cM
590 | 590 |
591 @ 14:d66ccb8c5871 add cL foo 591 @ 13:d66ccb8c5871 add cL foo
592 | 592 |
593 ~ 593 ~
594 594
595 Check that --hidden used with inhibit does not hide every obsolete commit 595 Check that --hidden used with inhibit does not hide every obsolete commit
596 We show the log before and after a log -G --hidden, they should be the same 596 We show the log before and after a log -G --hidden, they should be the same
597 $ hg log -G 597 $ hg log -G
598 o 16:a438c045eb37 add cN 598 o 15:a438c045eb37 add cN
599 | 599 |
600 o 15:2d66e189f5b5 add cM 600 o 14:2d66e189f5b5 add cM
601 | 601 |
602 @ 14:d66ccb8c5871 add cL 602 @ 13:d66ccb8c5871 add cL
603 | 603 |
604 | o 9:55c73a90e4b4 add cJ 604 | o 8:55c73a90e4b4 add cJ
605 | | 605 | |
606 o | 7:18214586bf78 add cJ 606 o | 7:18214586bf78 add cJ
607 |/ 607 |/
608 o 6:cf5c4f4554ce add cH 608 o 6:cf5c4f4554ce add cH
609 | 609 |
612 o 4:98065434e5c6 add cE 612 o 4:98065434e5c6 add cE
613 | 613 |
614 o 0:54ccbc537fc2 add cA 614 o 0:54ccbc537fc2 add cA
615 615
616 $ hg log -G --hidden 616 $ hg log -G --hidden
617 x 19:104eed5354c7 add cN 617 x 17:104eed5354c7 add cN
618 | 618 |
619 x 18:210589181b14 add cM 619 x 16:210589181b14 add cM
620 | 620 |
621 | x 17:b3c3274523f9 temporary amend commit for 2d66e189f5b5 621 | o 15:a438c045eb37 add cN
622 | | 622 | |
623 | | o 16:a438c045eb37 add cN 623 | o 14:2d66e189f5b5 add cM
624 | |/ 624 |/
625 | o 15:2d66e189f5b5 add cM 625 @ 13:d66ccb8c5871 add cL
626 |/ 626 |
627 @ 14:d66ccb8c5871 add cL 627 | x 12:2f7b7704d714 add cL
628 | 628 | |
629 | x 13:2f7b7704d714 add cL 629 | x 11:fe1634cbe235 add cK
630 | | 630 | |
631 | x 12:fe1634cbe235 add cK 631 | | x 10:53a94305e133 add cL
632 | |
633 | | x 11:53a94305e133 add cL
634 | | | 632 | | |
635 | | x 10:ad78ff7d621f add cK 633 | | x 9:ad78ff7d621f add cK
636 | | | 634 | | |
637 | | | o 9:55c73a90e4b4 add cJ 635 | | | o 8:55c73a90e4b4 add cJ
638 | | | |
639 +-------x 8:e84f73d9ad36 temporary amend commit for 18214586bf78
640 | | | | 636 | | | |
641 o-----+ 7:18214586bf78 add cJ 637 o-----+ 7:18214586bf78 add cJ
642 / / / 638 / / /
643 | | o 6:cf5c4f4554ce add cH 639 | | o 6:cf5c4f4554ce add cH
644 | | | 640 | | |
654 |/ 650 |/
655 o 0:54ccbc537fc2 add cA 651 o 0:54ccbc537fc2 add cA
656 652
657 653
658 $ hg log -G 654 $ hg log -G
659 o 16:a438c045eb37 add cN 655 o 15:a438c045eb37 add cN
660 | 656 |
661 o 15:2d66e189f5b5 add cM 657 o 14:2d66e189f5b5 add cM
662 | 658 |
663 @ 14:d66ccb8c5871 add cL 659 @ 13:d66ccb8c5871 add cL
664 | 660 |
665 | o 9:55c73a90e4b4 add cJ 661 | o 8:55c73a90e4b4 add cJ
666 | | 662 | |
667 o | 7:18214586bf78 add cJ 663 o | 7:18214586bf78 add cJ
668 |/ 664 |/
669 o 6:cf5c4f4554ce add cH 665 o 6:cf5c4f4554ce add cH
670 | 666 |
698 > inhibit=! 694 > inhibit=!
699 > [experimental] 695 > [experimental]
700 > evolution=createmarkers 696 > evolution=createmarkers
701 > EOF 697 > EOF
702 698
703 $ hg up 15 699 $ hg up 14
704 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 700 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
705 working directory parent is obsolete! (2d66e189f5b5) 701 working directory parent is obsolete! (2d66e189f5b5)
706 $ cat >> $HGRCPATH <<EOF 702 $ cat >> $HGRCPATH <<EOF
707 > [experimental] 703 > [experimental]
708 > evolution=all 704 > evolution=all
709 > EOF 705 > EOF
710 $ echo "CM" > cM 706 $ echo "CM" > cM
711 $ hg amend 707 $ hg amend
712 $ hg log -G 708 $ hg log -G
713 @ 21:721c3c279519 add cM 709 @ 18:721c3c279519 add cM
714 | 710 |
715 | o 16:a438c045eb37 add cN 711 | o 15:a438c045eb37 add cN
716 | | 712 | |
717 | x 15:2d66e189f5b5 add cM 713 | x 14:2d66e189f5b5 add cM
718 |/ 714 |/
719 o 14:d66ccb8c5871 add cL 715 o 13:d66ccb8c5871 add cL
720 | 716 |
721 o 7:18214586bf78 add cJ 717 o 7:18214586bf78 add cJ
722 | 718 |
723 o 6:cf5c4f4554ce add cH 719 o 6:cf5c4f4554ce add cH
724 | 720 |
741 Check that the behavior of rebase with obsolescence markers is maintained 737 Check that the behavior of rebase with obsolescence markers is maintained
742 despite inhibit 738 despite inhibit
743 739
744 $ hg up a438c045eb37 740 $ hg up a438c045eb37
745 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 741 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
746 $ hg rebase -r 15:: -d 21 --config experimental.rebaseskipobsolete=True 742 $ hg rebase -r 14:: -d 18 --config experimental.rebaseskipobsolete=True
747 note: not rebasing 15:2d66e189f5b5 "add cM", already in destination as 21:721c3c279519 "add cM" (tip) 743 note: not rebasing 14:2d66e189f5b5 "add cM", already in destination as 18:721c3c279519 "add cM" (tip)
748 rebasing 16:a438c045eb37 "add cN" 744 rebasing 15:a438c045eb37 "add cN"
749 $ hg up -q 2d66e189f5b5 # To inhibit it as the rest of test depends on it 745 $ hg up -q 2d66e189f5b5 # To inhibit it as the rest of test depends on it
750 $ hg up -q 21 746 $ hg up -q 18
751 747
752 Directaccess should load after some extensions precised in the conf 748 Directaccess should load after some extensions precised in the conf
753 With no extension specified: 749 With no extension specified:
754 750
755 $ cat >$TESTTMP/test_extension.py << EOF 751 $ cat >$TESTTMP/test_extension.py << EOF
815 searching for changes 811 searching for changes
816 adding changesets 812 adding changesets
817 adding manifests 813 adding manifests
818 adding file changes 814 adding file changes
819 added 1 changesets with 1 changes to 1 files (+1 heads) 815 added 1 changesets with 1 changes to 1 files (+1 heads)
820 2 new obsolescence markers 816 1 new obsolescence markers
821 817
822 Create a stack (obsolete with successor in dest) -> (not obsolete) and rebase 818 Create a stack (obsolete with successor in dest) -> (not obsolete) and rebase
823 it. We expect to not see the stack at the end of the rebase. 819 it. We expect to not see the stack at the end of the rebase.
824 $ hg log -G -r "25::" 820 $ hg log -G -r "003a4735afde::"
825 @ 25:71eb4f100663 add pk 821 x 20:003a4735afde add pk
826 | 822 |
827 ~ 823 ~
828 $ hg up -C 22 824 $ hg log -G
825 @ 21:71eb4f100663 add pk
826 |
827 | o 19:46cb6daad392 add cN
828 |/
829 o 18:721c3c279519 add cM
830 |
831 | o 16:210589181b14 add cM
832 |/
833 | o 14:2d66e189f5b5 add cM
834 |/
835 o 13:d66ccb8c5871 add cL
836 |
837 | o 8:55c73a90e4b4 add cJ
838 | |
839 o | 7:18214586bf78 add cJ
840 |/
841 o 6:cf5c4f4554ce add cH
842 |
843 o 5:5419eb264a33 add cG
844 |
845 o 4:98065434e5c6 add cE
846 |
847 o 0:54ccbc537fc2 add cA
848
849 $ hg up -C 46cb6daad392
829 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 850 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
830 $ mkcommit Dk 851 $ mkcommit Dk
831 $ hg prune 22 -s 25 852 $ hg prune 46cb6daad392 -s 71eb4f100663
832 1 changesets pruned 853 1 changesets pruned
833 $ hg rebase -s 22 -d 25 --config experimental.rebaseskipobsolete=True 854 $ hg rebase -s 46cb6daad392 -d 71eb4f100663 --config experimental.rebaseskipobsolete=True
834 note: not rebasing 22:46cb6daad392 "add cN", already in destination as 25:71eb4f100663 "add pk" 855 note: not rebasing 19:46cb6daad392 "add cN", already in destination as 21:71eb4f100663 "add pk"
835 rebasing 26:7ad60e760c7b "add Dk" (tip) 856 rebasing 22:7ad60e760c7b "add Dk" (tip)
836 $ hg log -G -r "25::" 857 $ hg log -G -r "71eb4f100663::"
837 @ 27:1192fa9fbc68 add Dk 858 @ 23:1192fa9fbc68 add Dk
838 | 859 |
839 o 25:71eb4f100663 add pk 860 o 21:71eb4f100663 add pk
840 | 861 |
841 ~ 862 ~
842 863
843 Create a stack (obsolete with succ in dest) -> (not obsolete) -> (not obsolete). 864 Create a stack (obsolete with succ in dest) -> (not obsolete) -> (not obsolete).
844 Rebase the first two revs of the stack onto dest, we expect to see one new 865 Rebase the first two revs of the stack onto dest, we expect to see one new
845 revision on the destination and everything visible. 866 revision on the destination and everything visible.
846 $ hg up 25 867 $ hg up 71eb4f100663
847 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 868 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
848 $ mkcommit Dl 869 $ mkcommit Dl
849 created new head 870 created new head
850 $ mkcommit Dp 871 $ mkcommit Dp
851 $ mkcommit Do 872 $ mkcommit Do
852 $ hg log -G -r "25::" 873 $ hg log -G -r "71eb4f100663::"
853 @ 30:b517facce1ef add Do 874 @ 26:b517facce1ef add Do
854 | 875 |
855 o 29:c5a47ab27c2e add Dp 876 o 25:c5a47ab27c2e add Dp
856 | 877 |
857 o 28:8c1c2edbaf1b add Dl 878 o 24:8c1c2edbaf1b add Dl
858 | 879 |
859 | o 27:1192fa9fbc68 add Dk 880 | o 23:1192fa9fbc68 add Dk
860 |/ 881 |/
861 o 25:71eb4f100663 add pk 882 o 21:71eb4f100663 add pk
862 | 883 |
863 ~ 884 ~
864 $ hg prune 28 -s 27 885 $ hg prune 8c1c2edbaf1b -s 1192fa9fbc68
865 1 changesets pruned 886 1 changesets pruned
866 $ hg up 25 887 $ hg up 71eb4f100663
867 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 888 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
868 $ hg rebase -r "28 + 29" --keep -d 27 --config experimental.rebaseskipobsolete=True 889 $ hg rebase -r "8c1c2edbaf1b + c5a47ab27c2e" --keep -d 1192fa9fbc68 --config experimental.rebaseskipobsolete=True
869 note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk" 890 note: not rebasing 24:8c1c2edbaf1b "add Dl", already in destination as 23:1192fa9fbc68 "add Dk"
870 rebasing 29:c5a47ab27c2e "add Dp" 891 rebasing 25:c5a47ab27c2e "add Dp"
871 $ hg log -G -r "25::" 892 $ hg log -G -r "71eb4f100663::"
872 o 31:7d8affb1f604 add Dp 893 o 27:7d8affb1f604 add Dp
873 | 894 |
874 | o 30:b517facce1ef add Do 895 | o 26:b517facce1ef add Do
875 | | 896 | |
876 | o 29:c5a47ab27c2e add Dp 897 | o 25:c5a47ab27c2e add Dp
877 | | 898 | |
878 | o 28:8c1c2edbaf1b add Dl 899 | o 24:8c1c2edbaf1b add Dl
879 | | 900 | |
880 o | 27:1192fa9fbc68 add Dk 901 o | 23:1192fa9fbc68 add Dk
881 |/ 902 |/
882 @ 25:71eb4f100663 add pk 903 @ 21:71eb4f100663 add pk
883 | 904 |
884 ~ 905 ~
885 906
886 Rebase the same stack in full on the destination, we expect it to disappear 907 Rebase the same stack in full on the destination, we expect it to disappear
887 and only see the top revision added to destination. We don\'t expect 29 to be 908 and only see the top revision added to destination. We don\'t expect 29 to be
888 skipped as we used --keep before. 909 skipped as we used --keep before.
889 $ hg rebase -s 28 -d 27 --config experimental.rebaseskipobsolete=True 910 $ hg rebase -s 8c1c2edbaf1b -d 1192fa9fbc68 --config experimental.rebaseskipobsolete=True
890 note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk" 911 note: not rebasing 24:8c1c2edbaf1b "add Dl", already in destination as 23:1192fa9fbc68 "add Dk"
891 rebasing 29:c5a47ab27c2e "add Dp" 912 rebasing 25:c5a47ab27c2e "add Dp"
892 rebasing 30:b517facce1ef "add Do" 913 rebasing 26:b517facce1ef "add Do"
893 $ hg log -G -r "25::" 914 $ hg log -G -r "71eb4f100663::"
894 o 32:1d43fff9e26f add Do 915 o 28:1d43fff9e26f add Do
895 | 916 |
896 o 31:7d8affb1f604 add Dp 917 o 27:7d8affb1f604 add Dp
897 | 918 |
898 o 27:1192fa9fbc68 add Dk 919 o 23:1192fa9fbc68 add Dk
899 | 920 |
900 @ 25:71eb4f100663 add pk 921 @ 21:71eb4f100663 add pk
901 | 922 |
902 ~ 923 ~
903 924
904 Pulling from a inhibit repo to a non-inhibit repo should work 925 Pulling from a inhibit repo to a non-inhibit repo should work
905 926