Mercurial > evolve
comparison tests/test-inhibit.t @ 2892:0eed6678b150
compat: adapt to test output changes
different access pattern in 4.4 means different results.
Make evolve works with mercurial core 72b5f4d53c58
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 01 Sep 2017 11:08:22 +0200 |
| parents | 4b934144ed11 |
| children | 06844693bb21 |
comparison
equal
deleted
inserted
replaced
| 2891:b18d2b2f18a6 | 2892:0eed6678b150 |
|---|---|
| 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 10 -d 3 |
| 435 abort: hidden revision '3'! | 435 abort: hidden revision '10'! |
| 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 2db36d8066ff for write operation | 440 Warning: accessing hidden changesets 2db36d8066ff for write operation |
| 440 Warning: accessing hidden changesets ad78ff7d621f,53a94305e133 for write operation | |
| 441 rebasing 10:ad78ff7d621f "add cK" | 441 rebasing 10:ad78ff7d621f "add cK" |
| 442 rebasing 11:53a94305e133 "add cL" | 442 rebasing 11:53a94305e133 "add cL" |
| 443 $ hg log -G | 443 $ hg log -G |
| 444 o 13:2f7b7704d714 add cL | 444 o 13:2f7b7704d714 add cL |
| 445 | | 445 | |
| 742 despite inhibit | 742 despite inhibit |
| 743 | 743 |
| 744 $ hg up a438c045eb37 | 744 $ hg up a438c045eb37 |
| 745 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 745 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 746 $ hg rebase -r 15:: -d 21 --config experimental.rebaseskipobsolete=True | 746 $ hg rebase -r 15:: -d 21 --config experimental.rebaseskipobsolete=True |
| 747 note: not rebasing 15:2d66e189f5b5 "add cM", already in destination as 21:721c3c279519 "add cM" | 747 note: not rebasing 15:2d66e189f5b5 "add cM", already in destination as 21:721c3c279519 "add cM" (tip) |
| 748 rebasing 16:a438c045eb37 "add cN" | 748 rebasing 16:a438c045eb37 "add cN" |
| 749 $ hg up -q 2d66e189f5b5 # To inhibit it as the rest of test depends on it | 749 $ hg up -q 2d66e189f5b5 # To inhibit it as the rest of test depends on it |
| 750 $ hg up -q 21 | 750 $ hg up -q 21 |
| 751 | 751 |
| 752 Directaccess should load after some extensions precised in the conf | 752 Directaccess should load after some extensions precised in the conf |