evolve: fixed some typos in stablerangecache LONG_MESSAGE (issue6279)
phase-divergent update to bf37ba1c80ee
=======================================================Teststheresolutionofcontentdivergence:interrupted=======================================================Thisfileintendtocovercasewhereevolvehastobeinterrupted.Thistestaimsatgathertestcasefor--abort,--continueand--stopTestsforthe--abortflagfor`hgevolve`commandwhilecontent-divergenceresolution======================================================================================The`--abort`flagabortstheinterruptedevolvebyundoingalltheworkwhichwasdoneduringresolutioni.e.strippingnewchangesetscreated,movingbookmarksback,movingworkingdirectoryback.Thistestcontainscaseswhen`hgevolve`isdoingcontent-divergenceresolution.Setup=====$cat>>$HGRCPATH<<EOF>[phases]>publish=False>[alias]>glog=log-GT"{rev}:{node|short}{desc}\n ({bookmarks}) {phase}">[experimental]>evolution.allowdivergence=True>[extensions]>EOF$echo"evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/">>$HGRCPATH$hginitabortrepo$cdabortrepo$echo".*\.orig">.hgignore$hgadd.hgignore$hgci-m"added hgignore"$forchinabcd;doechofoo>$ch;hgadd$ch;hgci-qm"added "$ch;done;$hgglog@4:c41c793e0ef1addedd|()drafto3:ca1b80f7960aaddedc|()drafto2:b1661037fa25addedb|()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draftCreatingcontentdivergence,resolutionofwhichwillleadtoconflicts-----------------------------------------------------------------------$echobar>d$hgamend$hgupc41c793e0ef1--hidden1filesupdated,0filesmerged,0filesremoved,0filesunresolvedupdatedtohiddenchangesetc41c793e0ef1(hiddenrevision'c41c793e0ef1'wasrewrittenas:e49523854bc8)workingdirectoryparentisobsolete!(c41c793e0ef1)(use'hg evolve'toupdatetoitssuccessor:e49523854bc8)$echofoobar>d$hgamend2newcontent-divergentchangesets$hgglog--hidden@6:9c1631e352d9addedd|()draft|*5:e49523854bc8addedd|/()draft|x4:c41c793e0ef1addedd|/()drafto3:ca1b80f7960aaddedc|()drafto2:b1661037fa25addedb|()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draft$hgevolve--content-divergent--no-allmerge:[6]addeddwith:[5]addeddbase:[4]addeddmergingdwarning:conflictswhilemergingd!(edit,thenuse'hg resolve --mark')0filesupdated,0filesmerged,0filesremoved,1filesunresolvedunresolvedmergeconflicts(see'hg help evolve.interrupted')[1]$hgstatus-vMd # The repository is in an unfinished *evolve* state. # Unresolved merge conflicts: # # d # # To mark files as resolved: hg resolve --mark FILE # To continue: hg evolve --continue # To abort: hg evolve --abort # To stop: hg evolve --stop # (also see `hg help evolve.interrupted`)$hgparentschangeset:6:9c1631e352d9tag:tipparent:3:ca1b80f7960auser:testdate:ThuJan0100:00:001970+0000instability:content-divergentsummary:addeddchangeset:5:e49523854bc8parent:3:ca1b80f7960auser:testdate:ThuJan0100:00:001970+0000instability:content-divergentsummary:addedd$hgevolve--abortevolveabortedworkingdirectoryisnowat9c1631e352d9$hgglog--hidden@6:9c1631e352d9addedd|()draft|*5:e49523854bc8addedd|/()draft|x4:c41c793e0ef1addedd|/()drafto3:ca1b80f7960aaddedc|()drafto2:b1661037fa25addedb|()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draftCreatingmultiplecontent-divergencewhereresolutionoflastoneresultsinconflictsandresolutionoffirstoneresultedinnonewcommit-----------------------------------------------------------------------------$echowatbar>d$hgamend$hgup.^0filesupdated,0filesmerged,1filesremoved,0filesunresolved$echobar>c$hgamend2neworphanchangesets$hgupca1b80f7960a--hidden1filesupdated,0filesmerged,0filesremoved,0filesunresolvedworkingdirectoryparentisobsolete!(ca1b80f7960a)(use'hg evolve'toupdatetoitssuccessor:2ba73e31f264)$echofoobar>c$hgamend2newcontent-divergentchangesets$echobar>c$hgamend$hgglog--hidden@10:491e10505baeaddedc|()draft|x9:7398f702a162addedc|/()draft|*8:2ba73e31f264addedc|/()draft|*7:f0f1694f123eaddedd||()draft||x6:9c1631e352d9addedd||/()draft||*5:e49523854bc8addedd||/()draft||x4:c41c793e0ef1addedd||/()draft|x3:ca1b80f7960aaddedc|/()drafto2:b1661037fa25addedb|()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draft$hgevolve--all--content-divergentmerge:[8]addedcwith:[10]addedcbase:[3]addedc0filesupdated,0filesmerged,0filesremoved,0filesunresolvedmerge:[5]addeddwith:[7]addeddbase:[4]addeddrebasing"divergent"content-divergentchangesete49523854bc8onddcf04e1458cmergingdwarning:conflictswhilemergingd!(edit,thenuse'hg resolve --mark')0filesupdated,0filesmerged,0filesremoved,1filesunresolvedunresolvedmergeconflicts(see'hg help evolve.interrupted')[1]$hgevolve--abort1neworphanchangesets2newcontent-divergentchangesetsevolveabortedworkingdirectoryisnowat491e10505bae$hgglog--hidden@10:491e10505baeaddedc|()draft|x9:7398f702a162addedc|/()draft|*8:2ba73e31f264addedc|/()draft|*7:f0f1694f123eaddedd||()draft||x6:9c1631e352d9addedd||/()draft||*5:e49523854bc8addedd||/()draft||x4:c41c793e0ef1addedd||/()draft|x3:ca1b80f7960aaddedc|/()drafto2:b1661037fa25addedb|()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draft$hgobslog-r.--all*2ba73e31f264(8)addedc||@491e10505bae(10)addedc|||x7398f702a162(9)addedc|/amended(content)as491e10505baeusingamendbytest(ThuJan0100:00:001970+0000)|xca1b80f7960a(3)addedcamended(content)as2ba73e31f264usingamendbytest(ThuJan0100:00:001970+0000)amended(content)as7398f702a162usingamendbytest(ThuJan0100:00:001970+0000)$cd..Creatingcontent-divergenceonmultipleparentswhengcaofdivergentchangesetsisparentofoneofthedivergentsandrelocatingleadstoconflicts---------------------------------------------------------------------------------$hginitmultiparent$cdmultiparent$echo".*\.orig">.hgignore$hgadd.hgignore$hgci-m"added hgignore"$forchinabcd;doechofoo>$ch;hgadd$ch;hgci-qm"added "$ch;done;$hgglog@4:c41c793e0ef1addedd|()drafto3:ca1b80f7960aaddedc|()drafto2:b1661037fa25addedb|()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draft$hgrebase-r.-d.^^^--configextensions.rebase=rebasing4:c41c793e0ef1"added d"(tip)$echobar>c$hgaddc$hgamend$hgup--hiddenc41c793e0ef12filesupdated,0filesmerged,0filesremoved,0filesunresolvedupdatedtohiddenchangesetc41c793e0ef1(hiddenrevision'c41c793e0ef1'wasrewrittenas:69bdd23a9b0d)workingdirectoryparentisobsolete!(c41c793e0ef1)(use'hg evolve'toupdatetoitssuccessor:69bdd23a9b0d)$echobar>d$hgamend2newcontent-divergentchangesets$hgglog@7:e49523854bc8addedd|()draft|*6:69bdd23a9b0daddedd||()drafto|3:ca1b80f7960aaddedc||()drafto|2:b1661037fa25addedb|/()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draft$hgevolve--content-divergentmerge:[7]addeddwith:[6]addeddbase:[4]addeddrebasing"other"content-divergentchangeset69bdd23a9b0donca1b80f7960amergingcwarning:conflictswhilemergingc!(edit,thenuse'hg resolve --mark')unresolvedmergeconflicts(see'hg help evolve.interrupted')[1]$hgevolve--abortevolveabortedworkingdirectoryisnowate49523854bc8$hgglog@7:e49523854bc8addedd|()draft|*6:69bdd23a9b0daddedd||()drafto|3:ca1b80f7960aaddedc||()drafto|2:b1661037fa25addedb|/()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draftCreatingcontent-divergenceonmultipleparentswhengcaofdivergentchangesetsisparentofoneofthedivergentsandmergingdivergentleadstoconflicts---------------------------------------------------------------------------------$hgup69bdd23a9b0d2filesupdated,0filesmerged,1filesremoved,0filesunresolved$hgrmc$echowat>d$hgamend$hgglog@8:33e4442acf98addedd|()draft|*7:e49523854bc8addedd||()draft|o3:ca1b80f7960aaddedc||()draft|o2:b1661037fa25addedb|/()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draft$hgevolve--content-divergentmerge:[7]addeddwith:[8]addeddbase:[4]addeddrebasing"other"content-divergentchangeset33e4442acf98onca1b80f7960amergingdwarning:conflictswhilemergingd!(edit,thenuse'hg resolve --mark')0filesupdated,0filesmerged,0filesremoved,1filesunresolvedunresolvedmergeconflicts(see'hg help evolve.interrupted')[1]$hgevolve--abortevolveabortedworkingdirectoryisnowat33e4442acf98$hgglog@8:33e4442acf98addedd|()draft|*7:e49523854bc8addedd||()draft|o3:ca1b80f7960aaddedc||()draft|o2:b1661037fa25addedb|/()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draft$cd..Testsforthe--stopflagfor`hgevolve`commandwhileresolvingcontent-divergence==================================================================================The`--stop`flagstopstheinterruptedevolutionanddeletethestatefilesousercandootherthingsandcomebackanddoevolutionlateronThisistestingcaseswhen`hgevolve`commandisdoingcontent-divergenceresolution.Setup=====$hginitstoprepo$cdstoprepo$echo".*\.orig">.hgignore$hgadd.hgignore$hgci-m"added hgignore"$forchinabcd;doechofoo>$ch;hgadd$ch;hgci-qm"added "$ch;done;$hgglog@4:c41c793e0ef1addedd|()drafto3:ca1b80f7960aaddedc|()drafto2:b1661037fa25addedb|()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draftCreatingcontentdivergence,resolutionofwhichwillleadtoconflicts-----------------------------------------------------------------------$echobar>d$hgamend$hgupc41c793e0ef1--hidden1filesupdated,0filesmerged,0filesremoved,0filesunresolvedupdatedtohiddenchangesetc41c793e0ef1(hiddenrevision'c41c793e0ef1'wasrewrittenas:e49523854bc8)workingdirectoryparentisobsolete!(c41c793e0ef1)(use'hg evolve'toupdatetoitssuccessor:e49523854bc8)$echofoobar>d$hgamend2newcontent-divergentchangesets$hgglog--hidden@6:9c1631e352d9addedd|()draft|*5:e49523854bc8addedd|/()draft|x4:c41c793e0ef1addedd|/()drafto3:ca1b80f7960aaddedc|()drafto2:b1661037fa25addedb|()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draft$hgevolve--content-divergent--no-allmerge:[6]addeddwith:[5]addeddbase:[4]addeddmergingdwarning:conflictswhilemergingd!(edit,thenuse'hg resolve --mark')0filesupdated,0filesmerged,0filesremoved,1filesunresolvedunresolvedmergeconflicts(see'hg help evolve.interrupted')[1]$hgevolve--stopstoppedtheinterruptedevolveworkingdirectoryisnowat9c1631e352d9$hgglog--hidden@6:9c1631e352d9addedd|()draft|*5:e49523854bc8addedd|/()draft|x4:c41c793e0ef1addedd|/()drafto3:ca1b80f7960aaddedc|()drafto2:b1661037fa25addedb|()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draftContentdivergencewithparentchangewhichwillresultinconflictswhilemerging---------------------------------------------------------------------------$hgrebase-r.-d.^^^--configextensions.rebase=rebasing6:9c1631e352d9"added d"(tip)$hgglog@7:517d4375cb72addedd|()draft|*5:e49523854bc8addedd||()draft|o3:ca1b80f7960aaddedc||()draft|o2:b1661037fa25addedb|/()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draft$hgevolve--content-divergentmerge:[5]addeddwith:[7]addeddbase:[4]addeddrebasing"other"content-divergentchangeset517d4375cb72onca1b80f7960amergingdwarning:conflictswhilemergingd!(edit,thenuse'hg resolve --mark')0filesupdated,0filesmerged,0filesremoved,1filesunresolvedunresolvedmergeconflicts(see'hg help evolve.interrupted')[1]$hgevolve--stopstoppedtheinterruptedevolveworkingdirectoryisnowat517d4375cb72$hgglog@7:517d4375cb72addedd|()draft|*5:e49523854bc8addedd||()draft|o3:ca1b80f7960aaddedc||()draft|o2:b1661037fa25addedb|/()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draftContent-divergencewithparent-changewhichwillresultinconflictswhilerelocation---------------------------------------------------------------------------$echobabar>c$hgaddc$hgamend$hgglog@8:8fd1c4bd144caddedd|()draft|*5:e49523854bc8addedd||()draft|o3:ca1b80f7960aaddedc||()draft|o2:b1661037fa25addedb|/()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draft$hgevolve--content-divergentmerge:[5]addeddwith:[8]addeddbase:[4]addeddrebasing"other"content-divergentchangeset8fd1c4bd144conca1b80f7960amergingcwarning:conflictswhilemergingc!(edit,thenuse'hg resolve --mark')unresolvedmergeconflicts(see'hg help evolve.interrupted')[1]$hgdiffdiff-rca1b80f7960ac---a/cThuJan0100:00:001970+0000+++b/cThuJan0100:00:001970+0000@@-1,1+1,5@@+<<<<<<<destination:ca1b80f7960a-test:addedcfoo+=======+babar+>>>>>>>evolving:8fd1c4bd144c-test:addedddiff-rca1b80f7960ad---/dev/nullThuJan0100:00:001970+0000+++b/dThuJan0100:00:001970+0000@@-0,0+1,1@@+foobar$hgevolve--stopstoppedtheinterruptedevolveworkingdirectoryisnowatca1b80f7960aXXX:weshouldhavepreservedthewdirtobeatrev8$hgglog*8:8fd1c4bd144caddedd|()draft|*5:e49523854bc8addedd||()draft|@3:ca1b80f7960aaddedc||()draft|o2:b1661037fa25addedb|/()drafto1:c7586e2a9264addeda|()drafto0:8fa14d15e168addedhgignore()draft$cd..