Mercurial > evolve
comparison tests/test-obsolete.t @ 3431:2e703ed1c713
evolve: update output for wider reporting of troubled changesets
CORE-TEST-OUTPUT-UPDATE: 1a09dad8b85a
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sat, 13 Jan 2018 14:35:49 -0800 |
| parents | d3a17c67f85c |
| children | f57be161f34b |
comparison
equal
deleted
inserted
replaced
| 3430:14fbb847be5a | 3431:2e703ed1c713 |
|---|---|
| 185 adding changesets | 185 adding changesets |
| 186 adding manifests | 186 adding manifests |
| 187 adding file changes | 187 adding file changes |
| 188 added 5 changesets with 5 changes to 5 files (+1 heads) | 188 added 5 changesets with 5 changes to 5 files (+1 heads) |
| 189 2 new obsolescence markers | 189 2 new obsolescence markers |
| 190 1 new orphan changesets | |
| 190 $ hg -R ../other-new verify | 191 $ hg -R ../other-new verify |
| 191 checking changesets | 192 checking changesets |
| 192 checking manifests | 193 checking manifests |
| 193 crosschecking files in changesets and manifests | 194 crosschecking files in changesets and manifests |
| 194 checking files | 195 checking files |
| 208 0 | 209 0 |
| 209 - 1f0dee641bb7 | 210 - 1f0dee641bb7 |
| 210 $ hg up --hidden 3 -q | 211 $ hg up --hidden 3 -q |
| 211 working directory parent is obsolete! (0d3f46688ccc) | 212 working directory parent is obsolete! (0d3f46688ccc) |
| 212 $ mkcommit obsol_d # 6 | 213 $ mkcommit obsol_d # 6 |
| 214 1 new orphan changesets | |
| 213 created new head | 215 created new head |
| 214 1 new orphan changesets | |
| 215 $ hg debugobsolete `getid 5` `getid 6` | 216 $ hg debugobsolete `getid 5` `getid 6` |
| 216 obsoleted 1 changesets | 217 obsoleted 1 changesets |
| 217 $ qlog | 218 $ qlog |
| 218 6 | 219 6 |
| 219 - 95de7fc6918d | 220 - 95de7fc6918d |
| 267 [1] | 268 [1] |
| 268 | 269 |
| 269 $ hg up --hidden -q .^ # 3 | 270 $ hg up --hidden -q .^ # 3 |
| 270 working directory parent is obsolete! (0d3f46688ccc) | 271 working directory parent is obsolete! (0d3f46688ccc) |
| 271 $ mkcommit "obsol_d'" # 7 | 272 $ mkcommit "obsol_d'" # 7 |
| 273 1 new orphan changesets | |
| 272 created new head | 274 created new head |
| 273 1 new orphan changesets | |
| 274 $ hg debugobsolete `getid 6` `getid 7` | 275 $ hg debugobsolete `getid 6` `getid 7` |
| 275 obsoleted 1 changesets | 276 obsoleted 1 changesets |
| 276 $ hg pull -R ../other-new . | 277 $ hg pull -R ../other-new . |
| 277 pulling from . | 278 pulling from . |
| 278 searching for changes | 279 searching for changes |
| 358 Test rollback support | 359 Test rollback support |
| 359 | 360 |
| 360 $ hg up --hidden .^ -q # 3 | 361 $ hg up --hidden .^ -q # 3 |
| 361 working directory parent is obsolete! (0d3f46688ccc) | 362 working directory parent is obsolete! (0d3f46688ccc) |
| 362 $ mkcommit "obsol_d''" | 363 $ mkcommit "obsol_d''" |
| 364 1 new orphan changesets | |
| 363 created new head | 365 created new head |
| 364 1 new orphan changesets | |
| 365 $ hg debugobsolete `getid 7` `getid 8` | 366 $ hg debugobsolete `getid 7` `getid 8` |
| 366 obsoleted 1 changesets | 367 obsoleted 1 changesets |
| 367 $ cd ../other-new | 368 $ cd ../other-new |
| 368 $ hg up -q 3 | 369 $ hg up -q 3 |
| 369 $ hg pull ../local/ | 370 $ hg pull ../local/ |
| 424 $ mkcommit toto # 9 | 425 $ mkcommit toto # 9 |
| 425 created new head | 426 created new head |
| 426 $ hg id -n | 427 $ hg id -n |
| 427 9 | 428 9 |
| 428 $ hg debugobsolete `getid 0` `getid 9` | 429 $ hg debugobsolete `getid 0` `getid 9` |
| 430 1 new phase-divergent changesets | |
| 429 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 | 431 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 |
| 430 # at core level the warning is not issued | 432 # at core level the warning is not issued |
| 431 # this is now a big issue now that we have bumped warning | 433 # this is now a big issue now that we have bumped warning |
| 432 $ qlog -r 'obsolete()' | 434 $ qlog -r 'obsolete()' |
| 433 3 | 435 3 |
| 552 adding manifests | 554 adding manifests |
| 553 adding file changes | 555 adding file changes |
| 554 added 2 changesets with 1 changes to [12] files (re) | 556 added 2 changesets with 1 changes to [12] files (re) |
| 555 3 new obsolescence markers | 557 3 new obsolescence markers |
| 556 obsoleted 1 changesets | 558 obsoleted 1 changesets |
| 559 2 new content-divergent changesets | |
| 557 $ hg up -q 10 | 560 $ hg up -q 10 |
| 558 $ mkcommit "obsol_d'''" | 561 $ mkcommit "obsol_d'''" |
| 559 created new head | 562 created new head |
| 560 $ hg debugobsolete `getid 11` `getid 12` | 563 $ hg debugobsolete `getid 11` `getid 12` |
| 561 obsoleted 1 changesets | 564 obsoleted 1 changesets |
| 682 commit: (clean) | 685 commit: (clean) |
| 683 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) | 686 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) |
| 684 phases: 3 draft | 687 phases: 3 draft |
| 685 phase-divergent: 1 changesets | 688 phase-divergent: 1 changesets |
| 686 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` | 689 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63` |
| 690 2 new content-divergent changesets | |
| 687 $ hg log -r 'contentdivergent()' | 691 $ hg log -r 'contentdivergent()' |
| 688 changeset: 12:6db5e282cb91 | 692 changeset: 12:6db5e282cb91 |
| 689 parent: 10:2033b4e49474 | 693 parent: 10:2033b4e49474 |
| 690 user: test | 694 user: test |
| 691 date: Thu Jan 01 00:00:00 1970 +0000 | 695 date: Thu Jan 01 00:00:00 1970 +0000 |