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`.
$cat>>$HGRCPATH<<EOF>[ui]>logtemplate={rev}:{node|short}{desc}\n>[defaults]>amend=-d"0 0">[alias]>glog=log-GT"{rev}: {desc}">[extensions]>hgext.rebase=>EOF$echo"evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/">>$HGRCPATH$hginitrepo$cdrepo$echoA>a$hgadda$hgcommit-maBasicusage$hglog-G@0:[0-9a-f]{12}a(re)$hgtouch.$hglog-G@1:[0-9a-f]{12}a(re)Reviveusage$echoA>b$hgaddb$hgcommit-mab--amend$hgup--hidden10filesupdated,0filesmerged,1filesremoved,0filesunresolvedupdatedtohiddenchangeset*(glob)(hiddenrevision'*'wasrewrittenas:*)(glob)workingdirectoryparentisobsolete!(*)(glob)(use'hg evolve'toupdatetoitssuccessor:*)(glob)$hglog-Go2:[0-9a-f]{12}ab(re)@1:[0-9a-f]{12}a(re)$hgtouch.[1]arevivingthischangesetwillcreatedivergenceunlessyoumakeaduplicate.(a)llowdivergenceor(d)uplicatethechangeset?a2newcontent-divergentchangesets$hglog-G@3:[0-9a-f]{12}a(re) \*2:[0-9a-f]{12}ab(re)$hgprune30filesupdated,0filesmerged,1filesremoved,0filesunresolvedworkingdirectoryisnowat0000000000001changesetsprunedDuplicate$hgtouch--duplicate.$hglog-G@4:[0-9a-f]{12}(re)o2:[0-9a-f]{12}ab(re)Multipletouch$echoC>c$hgaddc$hgcommit-mc$echoD>d$hgaddd$hgcommit-md$hglog-G@6:[0-9a-f]{12}d(re)|o5:[0-9a-f]{12}c(re)|o4:[0-9a-f]{12}(re)o2:[0-9a-f]{12}ab(re)$hgtouch.^:.$hglog-G@8:[0-9a-f]{12}d(re)|o7:[0-9a-f]{12}c(re)|o4:[0-9a-f]{12}(re)o2:[0-9a-f]{12}ab(re)checkmovedatakeptafterrebaseontouch:$touchgna1$hgcommit-Amgna1addinggna1$hgmvgna1gna2$hgcommit-mmove$hgst-C--change=tipAgna2gna1Rgna1$hgup.^1filesupdated,0filesmerged,1filesremoved,0filesunresolved$hgtouch1neworphanchangesets$hglog-G--hidden@11:[0-9a-f]{12}gna1(re)|. \*10:[0-9a-f]{12}move(re)||.x9:[0-9a-f]{12}gna1(re)|/o8:[0-9a-f]{12}d(re)|o7:[0-9a-f]{12}c(re)|.x6:[0-9a-f]{12}d(re)||.x5:[0-9a-f]{12}c(re)|/o4:[0-9a-f]{12}(re)x3:[0-9a-f]{12}a(re)o2:[0-9a-f]{12}ab(re)x1:[0-9a-f]{12}a(re)x0:[0-9a-f]{12}a(re)$hgrebase-s10-d11rebasing10:[0-9a-f]{12}"move"(re)$hgst-C--change=tipAgna2gna1Rgna1checkthatthe--duplicateoptiondoesnotcreatedivergence$hgtouch--duplicate10--hidden1neworphanchangesetscheckthatrevivingachangesetwithnosuccessordoesnotshowtheprompt$hgprune131changesetspruned$hgtouch13--hidden--note"testing with no successor"1neworphanchangesets$hgobslog-r13--hiddenx[0-9a-f]{12}(.*)move(re)prunedusingprunebytest(ThuJan0100:00:001970+0000)rewritten(.*)as[0-9a-f]{12}usingtouchbytest(.*)(re)note:testingwithnosuccessorPublicphase$hgphase--public-r2$hgtouch2abort:cannottouchpublicchangesets:*(glob)(see'hg help phases'fordetails)[255]$hgtouch--duplicate2Revivingmergecommit$hgup121filesupdated,0filesmerged,1filesremoved,0filesunresolved$hgmerge152filesupdated,0filesmerged,0filesremoved,0filesunresolved(branchmerge,don't forget to commit) $ hg ci -m merge $ hg st --change . A a A b $ hg prune -r . 0 files updated, 0 files merged, 2 files removed, 0 files unresolved working directory is now at * (glob) 1 changesets pruned $ hg touch 16 --hidden $ hg glog -r '12+15+17' o 17: merge |\ | o 15: ab | @ 12: move | ~ $ hg st --change 17 A a A b $ cd ..Make sure touch doesn'tfailtowarnaboutdivergence(issue6107)$hginittouchdiv$cdtouchdiv$echoc>c$hgaddc$hgci-m"added c"$hgamend-m"modified c"$hgprune.-q$hgtouch-r"desc('added c')"--hidden$hgtouch-r"desc('modified c')"--hidden[1]modifiedcrevivingthischangesetwillcreatedivergenceunlessyoumakeaduplicate.(a)llowdivergenceor(d)uplicatethechangeset?a2newcontent-divergentchangesets$cd..