evolve: test to show that --stop is not working when "divergent" relocated
Right now, --stop leave the intermediate changeset (relocating the divergent
changeset to its new location behind). This this is an incomplete step it should
be removed by `hg --stop`.
====================================Testingheadcheckingcode:CaseD-4====================================Mercurialchecksfortheintroductionofnewheadsonpush.Evolutioncomesintoplaytodetectifexistingbranchesontheserverarebeingreplacedbysomeofthenewonewepush.Thiscaseispartofaseriesoftestscheckingthisbehavior.CategoryD:remoteheadis"obs-affected"locally,butresultisnotpartofthepushTestCase4:multi-changesetbranch,splitonmultipleother,(baseonitsownnewbranch)..old-state:....*2branch(1changeset,and2changesets)....new-state:....*1newbranchsuperceedingthebaseoftheold-2-changesets-branch,..*1newchangesetsontheold-1-changeset-branchsuperceedingtheheadoftheother....expected-result:....*pushthenewbranchonly->pushdenied(varianta)..*pushtheexistingbranchonly->pushallowed(variantb)..(pushingallistestedascaseA-7)....graph-summary:....(varianta)....B'○⇢ø B.. | |.. A | ø⇠◔ A'..||/..C●|.. \|..●....or(variantb)....B'◔⇢ø B.. | |.. A | ø⇠○ A'..||/..C●|.. \|..●$.$TESTDIR/testlib/push-checkheads-util.shTestsetup----------$mkdirD4$cdD4$setupreposcreatingbasicserverandclientrepoupdatingtobranchdefault2filesupdated,0filesmerged,0filesremoved,0filesunresolved$cdserver$mkcommitB0$hgup00filesupdated,0filesmerged,2filesremoved,0filesunresolved$mkcommitC0creatednewhead$cd../client$hgpullpullingfrom$TESTTMP/D4/server(glob)searchingforchangesaddingchangesetsaddingmanifestsaddingfilechangesadded2changesetswith2changesto2files(+1heads)newchangesetsd73caddc5533:0f88766e02d6(2drafts)(run'hg heads'toseeheads,'hg merge'tomerge)$hgup00filesupdated,0filesmerged,1filesremoved,0filesunresolved$mkcommitA1creatednewhead$hgup'desc(C0)'1filesupdated,0filesmerged,1filesremoved,0filesunresolved$mkcommitB1$hgdebugobsolete`getid"desc(A0)"``getid"desc(A1)"`1newobsolescencemarkersobsoleted1changesets1neworphanchangesets$hgdebugobsolete`getid"desc(B0)"``getid"desc(B1)"`1newobsolescencemarkersobsoleted1changesets$hglog-G--hidden@d70a1f75a020(draft):B1||of6082bc4ffef(draft):A1||o|0f88766e02d6(draft):C0|/|xd73caddc5533(draft):B0|||x8aaa48160adc(draft):A0|/o1e4be0697311(public):rootActualtesting(newbranchonly)--------------------------------$hgpush--rev'desc(A1)'pushingto$TESTTMP/D4/server(glob)searchingforchangesabort:pushcreatesnewremoteheadf6082bc4ffef!(mergeorsee'hg help push'fordetailsaboutpushingnewheads)[255]Actualtesting(existingbranchonly)------------------------------------$hgpush--rev'desc(B1)'pushingto$TESTTMP/D4/server(glob)searchingforchangesaddingchangesetsaddingmanifestsaddingfilechangesadded1changesetswith1changesto1files1newobsolescencemarkersobsoleted1changesets$cd../..