evolve: set the second parent if we get conflicts while evolving
This patch makes sure we set the second parent correctly if we run into
conflicts while evolving. Also, we need to make sure to reset to one parent
before committing.
==============================Testcachewarmingstrategytestforrangebaseddiscovery==============================$.$TESTDIR/testlib/pythonpath.sh$cat<<EOF>>$HGRCPATH>[extensions]>hgext3rd.evolve=>blackbox=>[defaults]>blackbox=-l100>[experimental]>obshashrange=1>verbose-obsolescence-exchange=1>[ui]>logtemplate="{rev}{node|short}{desc}{tags}\n">ssh=python"$RUNTESTDIR/dummyssh">[alias]>debugobsolete=debugobsolete-d'0 0'>[ui]>ssh=$PYTHON"$RUNTESTDIR/dummyssh">EOF$hginitmain$hg-Rmaindebugbuilddag'.+7'$fornodein`hg-Rmainlog-T'{node}\n'`;do>echo-n$node|grep-o.|sort|tr-d"\n">ancfile>anc=`catancfile`>rmancfile>echo"marking $anc as predecessors of $node">hg-Rmaindebugobsolete$anc$node>donemarking000011223334456677789aaaaabbbbcccddddeefaspredecessorsof4de32a90b66cd083ebf3c00b41277aa7abca51ddmarking012234455555666699aaaaabbbccccccefffffffaspredecessorsoff69452c5b1af6cbaaa56ef50cf94fff5bcc6ca23marking00001122233445555777778889999abbcccddeefaspredecessorsofc8d03c1b5e94af74b772900c58259d2e08917735marking0011222445667777889999aabbbbcddddeeeeeeeaspredecessorsofbebd167eb94d257ace0e814aeb98e6972ed2970dmarking000011222223344555566778899aaaabccddefffaspredecessorsof2dc09a01254db841290af0538aa52f6f52c776e3marking01111222223333444455555566999abbbbcceeefaspredecessorsof01241442b3c2bf3211e593b549c655ea65b295e3marking01122444445555566677888aabbcccddddefffffaspredecessorsof66f7d451a68b85ed82ff5fcc254daf50c74144bdmarking000111111234444467777889999aaaabcdeeeeffaspredecessorsof1ea73414a91b0920940797d8fc6a11e447f8ea1e$hgdebugobsolete-Rmain000011223334456677789aaaaabbbbcccddddeef4de32a90b66cd083ebf3c00b41277aa7abca51dd0(ThuJan0100:00:001970+0000){'user':'test'}012234455555666699aaaaabbbcccccceffffffff69452c5b1af6cbaaa56ef50cf94fff5bcc6ca230(ThuJan0100:00:001970+0000){'user':'test'}00001122233445555777778889999abbcccddeefc8d03c1b5e94af74b772900c58259d2e089177350(ThuJan0100:00:001970+0000){'user':'test'}0011222445667777889999aabbbbcddddeeeeeeebebd167eb94d257ace0e814aeb98e6972ed2970d0(ThuJan0100:00:001970+0000){'user':'test'}000011222223344555566778899aaaabccddefff2dc09a01254db841290af0538aa52f6f52c776e30(ThuJan0100:00:001970+0000){'user':'test'}01111222223333444455555566999abbbbcceeef01241442b3c2bf3211e593b549c655ea65b295e30(ThuJan0100:00:001970+0000){'user':'test'}01122444445555566677888aabbcccddddefffff66f7d451a68b85ed82ff5fcc254daf50c74144bd0(ThuJan0100:00:001970+0000){'user':'test'}000111111234444467777889999aaaabcdeeeeff1ea73414a91b0920940797d8fc6a11e447f8ea1e0(ThuJan0100:00:001970+0000){'user':'test'}Cachemodeis"auto"solocalcommitdidnotwarmthecacheyet$f-smain/.hg/cache/evoext*main/.hg/cache/evoext-obscache-00:size=72Initialpush------------$hginitserver$hg-Rmainpushssh://user@dummy/serverpushingtossh://user@dummy/serversearchingforchangesOBSEXC:computingrelevantnodesOBSEXC:lookingforcommonmarkersin8nodesOBSEXC:computingmarkersrelevantto8nodesremote:addingchangesetsremote:addingmanifestsremote:addingfilechangesremote:added8changesetswith0changesto0filesremote:8newobsolescencemarkerssevercashiswarm$f-sserver/.hg/cache/evoext*server/.hg/cache/evoext-depthcache-00:size=88server/.hg/cache/evoext-firstmerge-00:size=88server/.hg/cache/evoext-obscache-00:size=72server/.hg/cache/evoext-stablesortcache-00:size=92server/.hg/cache/evoext_obshashrange_v2.sqlite:size=?*(glob)server/.hg/cache/evoext_stablerange_v2.sqlite:size=?*(glob)clientcashiswarm$f-smain/.hg/cache/evoext*main/.hg/cache/evoext-depthcache-00:size=88main/.hg/cache/evoext-firstmerge-00:size=88main/.hg/cache/evoext-obscache-00:size=72main/.hg/cache/evoext-stablesortcache-00:size=92main/.hg/cache/evoext_obshashrange_v2.sqlite:size=?*(glob)main/.hg/cache/evoext_stablerange_v2.sqlite:size=?*(glob)initialpull------------$rm-rfmain$hginitmain$hg-Rmainpullssh://user@dummy/serverpullingfromssh://user@dummy/serverrequestingallchangesaddingchangesetsaddingmanifestsaddingfilechangesadded8changesetswith0changesto0files8newobsolescencemarkersnewchangesets1ea73414a91b:4de32a90b66c(run'hg update'togetaworkingcopy)clientcacheisemptybecausethediscoverywasempty$f-smain/.hg/cache/evoext*main/.hg/cache/evoext-obscache-00:size=72nooppull------------clearcache$rm-rfmain/.hg/cache/evoextpullnothing$hg-Rmainpullssh://user@dummy/serverpullingfromssh://user@dummy/serversearchingforchangesnochangesfoundOBSEXC:lookingforcommonmarkersin8nodesclientcashiswarm$f-smain/.hg/cache/evoext*main/.hg/cache/evoext-depthcache-00:size=88main/.hg/cache/evoext-firstmerge-00:size=88main/.hg/cache/evoext-obscache-00:size=72main/.hg/cache/evoext-stablesortcache-00:size=92main/.hg/cache/evoext_obshashrange_v2.sqlite:size=?*(glob)main/.hg/cache/evoext_stablerange_v2.sqlite:size=?*(glob)nooppush------------clearcache$rm-rfmain/.hg/cache/evoextpushnothing$hg-Rmainpushssh://user@dummy/serverpushingtossh://user@dummy/serversearchingforchangesOBSEXC:computingrelevantnodesOBSEXC:lookingforcommonmarkersin8nodesOBSEXC:markersalreadyinsyncnochangesfound[1]clientcashiswarm$f-smain/.hg/cache/evoext*main/.hg/cache/evoext-depthcache-00:size=88main/.hg/cache/evoext-firstmerge-00:size=88main/.hg/cache/evoext-obscache-00:size=72main/.hg/cache/evoext-stablesortcache-00:size=92main/.hg/cache/evoext_obshashrange_v2.sqlite:size=?*(glob)main/.hg/cache/evoext_stablerange_v2.sqlite:size=?*(glob)