test: rename test about content divergent meta data
The test now use a name in line with the other content divergence test cases.
$."$TESTDIR/testlib/topic_setup.sh"$cat<<EOF>>$HGRCPATH>[ui]>logtemplate={rev}{branch}{get(namespaces,"topics")}{phase}{desc|firstline}\n>ssh=python"$RUNTESTDIR/dummyssh">EOF$hginitmain$hginitdraft$cat<<EOF>>draft/.hg/hgrc>[phases]>publish=False>EOF$hgclonemainclientupdatingtobranchdefault0filesupdated,0filesmerged,0filesremoved,0filesunresolved$cat<<EOF>>client/.hg/hgrc>[paths]>draft=../draft>EOFTestingcorebehaviortomakesurewedidnotbreakanything============================================================Pushingafirstchangeset$cdclient$echoaaa>aaa$hgaddaaa$hgcommit-m'CA'$hgoutgoing-Gcomparingwith$TESTTMP/main(glob)searchingforchanges@0defaultdraftCA$hgpushpushingto$TESTTMP/main(glob)searchingforchangesaddingchangesetsaddingmanifestsaddingfilechangesadded1changesetswith1changesto1filesPushingtwoheads$echoaaa>bbb$hgaddbbb$hgcommit-m'CB'$echoaaa>ccc$hgup'desc(CA)'0filesupdated,0filesmerged,1filesremoved,0filesunresolved$hgaddccc$hgcommit-m'CC'creatednewhead(considerusingtopicforlightweightbranches.See'hg help topic')$hgoutgoing-Gcomparingwith$TESTTMP/main(glob)searchingforchanges@2defaultdraftCCo1defaultdraftCB$hgpushpushingto$TESTTMP/main(glob)searchingforchangesabort:pushcreatesnewremotehead9fe81b7f425d!(mergeorsee'hg help push'fordetailsaboutpushingnewheads)[255]$hgoutgoing-r'desc(CB)'-Gcomparingwith$TESTTMP/main(glob)searchingforchangeso1defaultdraftCB$hgpush-r'desc(CB)'pushingto$TESTTMP/main(glob)searchingforchangesaddingchangesetsaddingmanifestsaddingfilechangesadded1changesetswith1changesto1filesPushinganewbranch$hgbranchmountainmarkedworkingdirectoryasbranchmountain(branchesarepermanentandglobal,didyouwantabookmark?)$hgcommit--amend$hgoutgoing-Gcomparingwith$TESTTMP/main(glob)searchingforchanges@3mountaindraftCC$hgpushpushingto$TESTTMP/main(glob)searchingforchangesabort:pushcreatesnewremotebranches:mountain!(use'hg push --new-branch'tocreatenewremotebranches)[255]$hgpush--new-branchpushingto$TESTTMP/main(glob)searchingforchangesaddingchangesetsaddingmanifestsaddingfilechangesadded1changesetswith1changesto1files(+1heads)1newobsolescencemarkersIncludingonnon-publishing$hgpush--new-branchdraftpushingto$TESTTMP/draft(glob)searchingforchangesaddingchangesetsaddingmanifestsaddingfilechangesadded3changesetswith3changesto3files(+1heads)1newobsolescencemarkersTestingtopicbehavior======================Localpeertests----------------$hgup-r'desc(CA)'0filesupdated,0filesmerged,1filesremoved,0filesunresolved$hgtopicbabarmarkedworkingdirectoryastopic:babar$echoaaa>ddd$hgaddddd$hgcommit-m'CD'activetopic'babar'grewitsfirstchangeset(see'hg help topics'formoreinformation)$hglog-G#keeptrackofphasebecauseIsawsomestrangebugduringdevelopement@4defaultbabardraftCD||o3mountainpublicCC|/|o1defaultpublicCB|/o0defaultpublicCAPushinganewtopictoanonpublishingservershouldnotbeseenasanewhead$hgpushdraftpushingto$TESTTMP/draft(glob)searchingforchangesaddingchangesetsaddingmanifestsaddingfilechangesadded1changesetswith1changesto1files(+1heads)$hglog-G@4defaultbabardraftCD||o3mountainpublicCC|/|o1defaultpublicCB|/o0defaultpublicCApush--topic$hglog-G-R$TESTTMP/drafto3defaultbabardraftCD||o2mountainpublicCC|/|o1defaultpublicCB|/o0defaultpublicCA$echobbb>>aaa$hgcommit-m"C'A"$hgup12filesupdated,0filesmerged,1filesremoved,0filesunresolved$hgtopic--clear$echobbb>>bbb$hgcommit-m"C'B"$hglog-G@6defaultdraftC'B | | o 5 default babar draft C'A|||o4defaultbabardraftCD||||o3mountainpublicCC||/o|1defaultpublicCB|/o0defaultpublicCA$hgoutgoingdraft--topicbabarcomparingwith$TESTTMP/draftsearchingforchanges5defaultbabardraftC'A $ hg push draft --topic babar pushing to $TESTTMP/draft searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files $ hg log -G -R $TESTTMP/draft o 4 default babar draft C'A|o3defaultbabardraftCD||o2mountainpublicCC|/|o1defaultpublicCB|/o0defaultpublicCA$hgstrip--configextensions.strip=--no-backup-r7a9e34dbf547:--quiet$hgstrip--configextensions.strip=-R$TESTTMP/draft--no-backup-r7a9e34dbf547:--quietPushinganewtopictoapublishingservershouldbeseenasanewhead$hgpushpushingto$TESTTMP/main(glob)searchingforchangesabort:pushcreatesnewremotehead67f579af159d!(mergeorsee'hg help push'fordetailsaboutpushingnewheads)[255]$hglog-G@4defaultbabardraftCD||o3mountainpublicCC|/|o1defaultpublicCB|/o0defaultpublicCAwireprotocoltests------------------$hgup-r'desc(CA)'0filesupdated,0filesmerged,1filesremoved,0filesunresolved$hgtopiccelestemarkedworkingdirectoryastopic:celeste$echoaaa>eee$hgaddeee$hgcommit-m'CE'activetopic'celeste'grewitsfirstchangeset(see'hg help topics'formoreinformation)$hglog-G#keeptrackofphasebecauseIsawsomestrangebugduringdevelopement@5defaultcelestedraftCE||o4defaultbabardraftCD|/|o3mountainpublicCC|/|o1defaultpublicCB|/o0defaultpublicCAPushinganewtopictoanonpublishingserverwithouttopic->newhead$cat<<EOF>>../draft/.hg/hgrc>[extensions]>topic=!>EOF$hgpushssh://user@dummy/draftpushingtossh://user@dummy/draftsearchingforchangesabort:pushcreatesnewremotehead84eaf32db6c3!(mergeorsee'hg help push'fordetailsaboutpushingnewheads)[255]$hglog-G@5defaultcelestedraftCE||o4defaultbabardraftCD|/|o3mountainpublicCC|/|o1defaultpublicCB|/o0defaultpublicCAPushinganewtopictoanonpublishingservershouldnotbeseenasanewhead$printf"topic=">>../draft/.hg/hgrc$hgconfigextensions.topic>>../draft/.hg/hgrc$hgpushssh://user@dummy/draftpushingtossh://user@dummy/draftsearchingforchangesremote:addingchangesetsremote:addingmanifestsremote:addingfilechangesremote:added1changesetswith1changesto1files(+1heads)$hglog-G@5defaultcelestedraftCE||o4defaultbabardraftCD|/|o3mountainpublicCC|/|o1defaultpublicCB|/o0defaultpublicCAPushinganewtopictoapublishingservershouldbeseenasanewhead$hgpushssh://user@dummy/mainpushingtossh://user@dummy/mainsearchingforchangesabort:pushcreatesnewremotehead67f579af159d!(mergeorsee'hg help push'fordetailsaboutpushingnewheads)[255]$hglog-G@5defaultcelestedraftCE||o4defaultbabardraftCD|/|o3mountainpublicCC|/|o1defaultpublicCB|/o0defaultpublicCACheckthatwerejectmultipleheadonthesametopic----------------------------------------------------$hgup'desc(CB)'1filesupdated,0filesmerged,1filesremoved,0filesunresolved$hgtopicbabarmarkedworkingdirectoryastopic:babar$echoaaa>fff$hgaddfff$hgcommit-m'CF'$hglog-G@6defaultbabardraftCF||o5defaultcelestedraftCE||||o4defaultbabardraftCD||/||o3mountainpublicCC||/o|1defaultpublicCB|/o0defaultpublicCA$hgpushdraftpushingto$TESTTMP/draft(glob)searchingforchangesabort:pushcreatesnewremoteheadf0bc62a661beonbranch'default:babar'!(mergeorsee'hg help push'fordetailsaboutpushingnewheads)[255]Multipleheadonabranchmergedinatopicchangesets------------------------------------------------------------------------$hgup'desc(CA)'0filesupdated,0filesmerged,2filesremoved,0filesunresolved$echoaaa>ggg$hgaddggg$hgcommit-m'CG'creatednewhead(considerusingtopicforlightweightbranches.See'hg help topic')$hgup'desc(CF)'switchingtotopicbabar2filesupdated,0filesmerged,1filesremoved,0filesunresolved$hgmerge'desc(CG)'1filesupdated,0filesmerged,0filesremoved,0filesunresolved(branchmerge,don't forget to commit) $ hg commit -m 'CM' $ hg log -G @ 8 default babar draft CM |\ | o 7 default draft CG | | o | 6 default babar draft CF | | | | o 5 default celeste draft CE | |/ | | o 4 default babar draft CD | |/ | | o 3 mountain public CC | |/ o | 1 default public CB |/ o 0 default public CAReject when pushing to draft $ hg push draft -r . pushing to $TESTTMP/draft (glob) searching for changes abort: push creates new remote head 4937c4cad39e! (merge or see 'hghelppush' for details about pushing new heads) [255]Reject when pushing to publishing $ hg push -r . pushing to $TESTTMP/main (glob) searching for changes adding changesets adding manifests adding file changes added 3 changesets with 2 changes to 2 files $ cd ..Test phase move==================================setup, two repo knowns about two small topic branch $ hg init repoA $ hg clone repoA repoB updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat <<EOF>> repoA/.hg/hgrc > [phases] > publish=False > EOF $ cat <<EOF>> repoB/.hg/hgrc > [phases] > publish=False > EOF $ cd repoA $ echo aaa > base $ hg add base $ hg commit -m 'CBASE' $ echo aaa > aaa $ hg add aaa $ hg topic topicA marked working directory as topic: topicA $ hg commit -m 'CA' active topic 'topicA' grew its first changeset (see 'hghelptopics' for more information) $ hg up 'desc(CBASE)' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo aaa > bbb $ hg add bbb $ hg topic topicB marked working directory as topic: topicB $ hg commit -m 'CB' active topic 'topicB' grew its first changeset (see 'hghelptopics' for more information) $ cd .. $ hg push -R repoA repoB pushing to repoB searching for changes adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 3 files (+1 heads) $ hg log -G -R repoA @ 2 default topicB draft CB | | o 1 default topicA draft CA |/ o 0 default draft CBASEWe turn different topic to public on each side, $ hg -R repoA phase --public topicA $ hg -R repoB phase --public topicBPushing should complain because it create to heads on default $ hg push -R repoA repoB pushing to repoB searching for changes no changes found abort: push create a new head on branch "default" [255]