tests: update output for shorted prompts from Mercurial
This makes tests pass again after Mercurial commits 4764e8436b2a
(filemerge: make last line of prompts <40 english chars (issue6158),
2019-06-20)
CORE-TEST-OUTPUT-UPDATE: 4764e8436b2a
Testing`hgstack`oncomplexcaseswhenwehavemultiplesuccessorsbecauseofdivergence,splitetc.$."$TESTDIR/testlib/topic_setup.sh"Setup$cat<<EOF>>$HGRCPATH>[experimental]>evolution=all>[ui]>interactive=True>[extensions]>show=>EOF$echo"evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/">>$HGRCPATH$hginittest$cdtest$echofoo>foo$hgaddfoo$hgci-m"Added foo"$hgphase-r.--public$hgtopicfoomarkedworkingdirectoryastopic:foo$echoa>a$echob>b$hgci-Aqm"Added a and b"$echoc>c$echod>d$hgci-Aqm"Added c and d"$echoe>e$echof>f$hgci-Aqm"Added e and f"$hgshowwork@f1d3(foo)Addedeandfo8e82(foo)Addedcanddo002b(foo)Addedaandbof360AddedfooTestingincaseofsplitwithinthetopic$hgstack ### topic: foo ### target: default (branch)s3@Addedeandf(current)s2:Addedcandds1:Addedaandbs0^Addedfoo(base)$hgprev0filesupdated,0filesmerged,2filesremoved,0filesunresolved[s2]Addedcandd$echo0>num$cat>editor.sh<<'__EOF__'>NUM=$(catnum)>NUM=`expr"$NUM"+1`>echo"$NUM">num>echo"split$NUM">"$1">__EOF__$exportHGEDITOR="\"sh\"\"editor.sh\""$hgsplit<<EOF>y>y>n>c>EOF0filesupdated,0filesmerged,2filesremoved,0filesunresolvedaddingcaddingddiff--gita/cb/cnewfilemode100644examinechangesto'c'?[Ynesfdaq?]y@@-0,0+1,1@@+crecordchange1/2to'c'?[Ynesfdaq?]ydiff--gita/db/dnewfilemode100644examinechangesto'd'?[Ynesfdaq?]ncontinuesplitting?[Ycdq?]c1neworphanchangesets$hgstack ### topic: foo ### target: default (branch)s4$Addedeandf(orphan)s3@split2(current)s2:split1s1:Addedaandbs0^Addedfoo(base)$hgshowwork@5cce(foo)split2of26c(foo)split1|*f1d3(foo)Addedeandf|x8e82(foo)Addedcandd|/o002b(foo)Addedaandbof360Addedfoo$hgprev0filesupdated,0filesmerged,1filesremoved,0filesunresolved[s2]split1$echofoo>c$hgdiffdiff-rf26c1b9adddec---a/cThuJan0100:00:001970+0000+++b/cThuJan0100:00:001970+0000@@-1,1+1,1@@-c+foo$hgamend1neworphanchangesets$hgshowwork@7d94(foo)split1|*5cce(foo)split2|xf26c(foo)split1|/|*f1d3(foo)Addedeandf|x8e82(foo)Addedcandd|/o002b(foo)Addedaandbof360Addedfoo$hgstack ### topic: foo (2 heads) ### target: default (branch), 2 behinds4$Addedeandf(orphan)s3$split2(orphan)s2@split1(current)s1:Addedaandbs0^Addedfoo(base)Testcasewithdivergence-------------------------$hgevolve--allmove:[s3]split2atop:[s2]split1move:[s4]Addedeandf$hgups43filesupdated,0filesmerged,0filesremoved,0filesunresolved$hgid-r.ec94a1ed1330tip$hgup--hidden'min(predecessors(.))'1filesupdated,0filesmerged,0filesremoved,0filesunresolvedupdatedtohiddenchangesetf1d3649d6a8b(hiddenrevision'f1d3649d6a8b'wasrewrittenas:ec94a1ed1330)workingdirectoryparentisobsolete!(f1d3649d6a8b)(use'hg evolve'toupdatetoitssuccessor:ec94a1ed1330)$hgamend-d'0 1'1neworphanchangesets2newcontent-divergentchangesets$hgrebase-r.-dec94a1ed1330~1rebasing9:eb3b16fef8ea"Added e and f"(tipfoo)$hgstack###topic:foo(2heads) ### target: default (branch)s5$Addedeandf(contentdivergent)s3^split2(base)s4@Addedeandf(contentdivergentcurrent)s3:split2s2:split1s1:Addedaandbs0^Addedfoo(base)$hgevolve--content-divergent-rec94a1ed1330merge:[s5]Addedeandfwith:[s4]Addedeandfbase:[3]Addedeandf0filesupdated,0filesmerged,0filesremoved,0filesunresolvedworkingdirectoryisnowat8faad6276dc6