Mercurial > evolve
comparison tests/test-obsolete.t @ 2710:e22de367fc74
compat: adapt to change in 53b3a1968aa6-core
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 07 Jul 2017 00:42:18 +0200 |
| parents | 5d54de9cf50f |
| children | 21f06d932231 |
comparison
equal
deleted
inserted
replaced
| 2709:5d54de9cf50f | 2710:e22de367fc74 |
|---|---|
| 236 adding changesets | 236 adding changesets |
| 237 adding manifests | 237 adding manifests |
| 238 adding file changes | 238 adding file changes |
| 239 added 1 changesets with 1 changes to 1 files (+1 heads) | 239 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 240 1 new obsolescence markers | 240 1 new obsolescence markers |
| 241 obsoleted 1 changesets | |
| 241 $ qlog -R ../other-new | 242 $ qlog -R ../other-new |
| 242 5 | 243 5 |
| 243 - 95de7fc6918d | 244 - 95de7fc6918d |
| 244 3 | 245 3 |
| 245 - 725c380fe99b | 246 - 725c380fe99b |
| 273 adding changesets | 274 adding changesets |
| 274 adding manifests | 275 adding manifests |
| 275 adding file changes | 276 adding file changes |
| 276 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) | 277 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
| 277 1 new obsolescence markers | 278 1 new obsolescence markers |
| 279 obsoleted 1 changesets | |
| 278 (run 'hg heads' to see heads, 'hg merge' to merge) | 280 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 279 $ qlog -R ../other-new | 281 $ qlog -R ../other-new |
| 280 6 | 282 6 |
| 281 - 909a0fb57e5d | 283 - 909a0fb57e5d |
| 282 3 | 284 3 |
| 363 adding changesets | 365 adding changesets |
| 364 adding manifests | 366 adding manifests |
| 365 adding file changes | 367 adding file changes |
| 366 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) | 368 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) |
| 367 1 new obsolescence markers | 369 1 new obsolescence markers |
| 370 obsoleted 1 changesets | |
| 368 (run 'hg heads' to see heads, 'hg merge' to merge) | 371 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 369 | 372 |
| 370 $ hg up -q 7 # to check rollback update behavior | 373 $ hg up -q 7 # to check rollback update behavior |
| 371 $ qlog | 374 $ qlog |
| 372 7 | 375 7 |
| 539 adding changesets | 542 adding changesets |
| 540 adding manifests | 543 adding manifests |
| 541 adding file changes | 544 adding file changes |
| 542 added 2 changesets with 1 changes to [12] files (re) | 545 added 2 changesets with 1 changes to [12] files (re) |
| 543 3 new obsolescence markers | 546 3 new obsolescence markers |
| 547 obsoleted 1 changesets | |
| 544 $ hg up -q 10 | 548 $ hg up -q 10 |
| 545 $ mkcommit "obsol_d'''" | 549 $ mkcommit "obsol_d'''" |
| 546 created new head | 550 created new head |
| 547 $ hg debugobsolete `getid 11` `getid 12` | 551 $ hg debugobsolete `getid 11` `getid 12` |
| 548 $ hg push ../other-new --traceback | 552 $ hg push ../other-new --traceback |
| 551 adding changesets | 555 adding changesets |
| 552 adding manifests | 556 adding manifests |
| 553 adding file changes | 557 adding file changes |
| 554 added 1 changesets with 1 changes to 1 files (+1 heads) | 558 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 555 1 new obsolescence markers | 559 1 new obsolescence markers |
| 560 obsoleted 1 changesets | |
| 556 $ cd .. | 561 $ cd .. |
| 557 | 562 |
| 558 check bumped detection | 563 check bumped detection |
| 559 (make an obsolete changeset public) | 564 (make an obsolete changeset public) |
| 560 | 565 |