tests/test-obsolete.t
branchstable
changeset 4507 de9089514833
parent 4471 3caa4a459439
child 4512 7a779a288793
child 4624 c9798965b1f4
equal deleted inserted replaced
4486:099e0ca8285e 4507:de9089514833
   234   pushing to ../other-new
   234   pushing to ../other-new
   235   searching for changes
   235   searching for changes
   236   abort: push includes orphan changeset: 95de7fc6918d!
   236   abort: push includes orphan changeset: 95de7fc6918d!
   237   (use 'hg evolve' to get a stable history or --force to ignore warnings)
   237   (use 'hg evolve' to get a stable history or --force to ignore warnings)
   238   [255]
   238   [255]
   239   $ hg push ../other-new -f # use f because there is unstability
   239   $ hg push ../other-new -f # use f because there is an orphan
   240   pushing to ../other-new
   240   pushing to ../other-new
   241   searching for changes
   241   searching for changes
   242   adding changesets
   242   adding changesets
   243   adding manifests
   243   adding manifests
   244   adding file changes
   244   adding file changes
   429   9
   429   9
   430   $ hg debugobsolete `getid 0` `getid 9`
   430   $ hg debugobsolete `getid 0` `getid 9`
   431   1 new phase-divergent changesets
   431   1 new phase-divergent changesets
   432 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7
   432 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7
   433 # at core level the warning is not issued
   433 # at core level the warning is not issued
   434 # this is now a big issue now that we have bumped warning
   434 # this is now a big issue now that we have phase divergence warning
   435   $ qlog -r 'obsolete()'
   435   $ qlog -r 'obsolete()'
   436   3
   436   3
   437   - 0d3f46688ccc
   437   - 0d3f46688ccc
   438 allow to just kill changeset
   438 allow to just kill changeset
   439 
   439 
   572   added 1 changesets with 1 changes to 1 files (+1 heads)
   572   added 1 changesets with 1 changes to 1 files (+1 heads)
   573   1 new obsolescence markers
   573   1 new obsolescence markers
   574   obsoleted 1 changesets
   574   obsoleted 1 changesets
   575   $ cd ..
   575   $ cd ..
   576 
   576 
   577 check bumped detection
   577 check phase divergence detection
   578 (make an obsolete changeset public)
   578 (make an obsolete changeset public)
   579 
   579 
   580   $ cd local
   580   $ cd local
   581   $ hg phase --hidden --public 11
   581   $ hg phase --hidden --public 11
   582   1 new phase-divergent changesets
   582   1 new phase-divergent changesets