test: adapt to output change from eb586ed5d8ce
Core have a more verbose output on pull. We have to update tests with it.
CORE-TEST-OUTPUT-UPDATE: eb586ed5d8ce
============================================Testingobsolescencemarkerspush:CasesD.4============================================Mercurialpushesobsolescencesmarkersrelevanttothe"pushed-set",thesetofallchangesetsthatrequestedtobe"in sync"afterthepush(eveniftheyarealreadyonbothside).Thistestbelongstoaseriesoftestscheckingsuchsetisproperlycomputedandapplied.Thisdoesnottests"obsmarkers"discoverycapabilities.CategoryD:PartialInformationCaseTestCase4:UnknownchangesetinbetweenknownchangesetsD.4Unknownchangesetinbetweenknownone==========================================..Mostlyaclarificationcase....{{{..Bø⇠◌⇠○B''..||..Aø⇠◌⇠◔A'.. \ /.. ● O.... }}}.... Should be treated as A.3 case:.... {{{.... B ø⇠○ B''.. | |.. A ø⇠◔ A'..|/..●O....}}}Setup-----$.$TESTDIR/testlib/exchange-obsmarker-util.shinitial$setupreposD.4creatingtestrepofortestcaseD.4-pulldest-main-pushdestcdinto`main`andproceedwithenvsetup$cdmain$mkcommitA0$mkcommitB0$hgupdate-q0$mkcommitA1creatednewhead$mkcommitB1$hgdebugobsolete`getid'desc(A0)'`aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaobsoleted1changesets$hgdebugobsoleteaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa`getid'desc(A1)'`$hgdebugobsolete`getid'desc(B0)'`bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbobsoleted1changesets$hgdebugobsoletebbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb`getid'desc(B1)'`$hglog-G--hidden@069b05c3876d(draft):B1|oe5ea8f9c7314(draft):A1||x6e72f0a95b5e(draft):B0|||x28b51eb45704(draft):A0|/oa9bdc8b26820(public):O$inspect_obsmarkersobsstorecontent================28b51eb45704506b5c603decd6bf7ac5e0f6a52faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0(*){'user':'test'}(glob)aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaae5ea8f9c73143125d36658e90ef70c6d2027a5b70(*){'user':'test'}(glob)6e72f0a95b5e01a7504743aa941f69cb1fbef8b0bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb0(*){'user':'test'}(glob)bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb069b05c3876d56f62895e853a501ea58ea85f68d0(*){'user':'test'}(glob)obshashtree===========a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04000000000000000000000000000000000000000028b51eb45704506b5c603decd6bf7ac5e0f6a52f00000000000000000000000000000000000000006e72f0a95b5e01a7504743aa941f69cb1fbef8b00000000000000000000000000000000000000000e5ea8f9c73143125d36658e90ef70c6d2027a5b70aacc2f86e8fca29f2d5fd8d0790644620acd58a069b05c3876d56f62895e853a501ea58ea85f68d40b98bc2b5b1152416ea8e9665ae1c6a3ce32ba0obshashrange============revnodeindexsizedepthobshash4069b05c3876d033a2b2331da6503e5ea8f9c73140220aacc2f86e8f4069b05c3876d213901f118d43330a9bdc8b268200110000000000003e5ea8f9c73141120aacc2f86e8f$cd..$cd..ActualTest-----------$dotestD.4A1##RunningtestcaseD.4 # testing echange of "A1" (e5ea8f9c7314) ## initial state # obstore: main28b51eb45704506b5c603decd6bf7ac5e0f6a52faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0(*){'user':'test'}(glob)6e72f0a95b5e01a7504743aa941f69cb1fbef8b0bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb0(*){'user':'test'}(glob)aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaae5ea8f9c73143125d36658e90ef70c6d2027a5b70(*){'user':'test'}(glob)bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb069b05c3876d56f62895e853a501ea58ea85f68d0(*){'user':'test'}(glob) # obstore: pushdest # obstore: pulldest ## pushing "A1" from main to pushdestpushingtopushdestsearchingforchangesremote:addingchangesetsremote:addingmanifestsremote:addingfilechangesremote:added1changesetswith1changesto1filesremote:2newobsolescencemarkers##postpushstate#obstore:main28b51eb45704506b5c603decd6bf7ac5e0f6a52faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0(*){'user':'test'}(glob)6e72f0a95b5e01a7504743aa941f69cb1fbef8b0bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb0(*){'user':'test'}(glob)aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaae5ea8f9c73143125d36658e90ef70c6d2027a5b70(*){'user':'test'}(glob)bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb069b05c3876d56f62895e853a501ea58ea85f68d0(*){'user':'test'}(glob) # obstore: pushdest28b51eb45704506b5c603decd6bf7ac5e0f6a52faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0(*){'user':'test'}(glob)aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaae5ea8f9c73143125d36658e90ef70c6d2027a5b70(*){'user':'test'}(glob) # obstore: pulldest ## pulling "e5ea8f9c7314" from main into pulldestpullingfrommainsearchingforchangesaddingchangesetsaddingmanifestsaddingfilechangesadded1changesetswith1changesto1files2newobsolescencemarkersnewchangesetse5ea8f9c7314(run'hg update'togetaworkingcopy) ## post pull state # obstore: main28b51eb45704506b5c603decd6bf7ac5e0f6a52faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0(*){'user':'test'}(glob)6e72f0a95b5e01a7504743aa941f69cb1fbef8b0bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb0(*){'user':'test'}(glob)aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaae5ea8f9c73143125d36658e90ef70c6d2027a5b70(*){'user':'test'}(glob)bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb069b05c3876d56f62895e853a501ea58ea85f68d0(*){'user':'test'}(glob) # obstore: pushdest28b51eb45704506b5c603decd6bf7ac5e0f6a52faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0(*){'user':'test'}(glob)aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaae5ea8f9c73143125d36658e90ef70c6d2027a5b70(*){'user':'test'}(glob) # obstore: pulldest28b51eb45704506b5c603decd6bf7ac5e0f6a52faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0(*){'user':'test'}(glob)aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaae5ea8f9c73143125d36658e90ef70c6d2027a5b70(*){'user':'test'}(glob)