test: apply unstability resolution to `test-unstability-resolution-result.t`
The test cases in this file probably deserved to be dispatched in other more
thematic test file.
$cat>>$HGRCPATH<<EOF>[extensions]>EOF$echo"evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/">>$HGRCPATH$glog(){>hglog-G--template'{rev}@{branch}({phase}) {desc|firstline}\n'"$@">}$hginitrepo--traceback$cdrepo$echoa>a$hgci-AmaddaaddingaTestthatamendcapturesbranches$hgbranchfoomarkedworkingdirectoryasbranchfoo(branchesarepermanentandglobal,didyouwantabookmark?)$hgamend-d'0 0'-n"this a note on the obsmarker and supported for hg>=4.4"$hgdebugobsolete07f4944404050f47db2e5c5071e0e84e7a27bba96a022cbb61d5ba0f03f98ff2d36319dfea1034ae0(*){'ef1':'*','user':'test'}(glob)$hgobslog@6a022cbb61d5(1)adda|x07f494440405(0)addarewritten(branch)as6a022cbb61d5usingamendbytest(ThuJan0100:00:001970+0000)note:thisanoteontheobsmarkerandsupportedforhg>=4.4$hgbranchfoo$hgbranchesfoo1:6a022cbb61d5$glog@1@foo(draft)addaTestno-op$hgamend-d'0 0'nothingchanged[1]$glog@1@foo(draft)addaTestforcingthemessagetothesamevalue,nointermediaterevision.$hgamend-d'0 0'-m'adda'nothingchanged[1]$glog@1@foo(draft)addaTestcollapsingintoanexistingrevision,nointermediaterevision.$echoa>>a$hgci-mchangea$echoa>a$hgstatusMa$hgpstatus$hgdiffdiff-rf7a50201fe3aa---a/aThuJan0100:00:001970+0000+++b/a*+0000(glob)@@-1,2+1,1@@a-a$hgpdiff$hgci-mreseta$hgdebugobsolete07f4944404050f47db2e5c5071e0e84e7a27bba96a022cbb61d5ba0f03f98ff2d36319dfea1034ae0(*){'ef1':'*','user':'test'}(glob)$hgphase22:draft$glog@3@foo(draft)reseta|o2@foo(draft)changea|o1@foo(draft)addaSpecifyprecisecommitdatewith-d$hgamend-d'2001-02-03 04:05:06 +0700'$hgparents--template'{rev}{date|date}\n'4SatFeb0304:05:062001+0700Specify"now"ascommitdatewith-D$before=`date+%s`$hgamend-D$commit=`hgparents--template'{date|hgdate} rev{rev}\n'`$after=`date+%s`$(echo$before;echo$commit;echo$after)|sort-k1-n-s \d+(re) \d+0rev5(re) \d+(re)Specifycurrentuserascommitterwith-U$HGUSER=newbiehgamend-U$hgparents--template'{rev}{author}\n'6newbieCheckthat--logfileworks$echo"logfile message">logfile.txt$hgamend-llogfile.txt$hglog-r.-T"{desc}\n"logfilemessage# Make sure we don't get reparented to -1 with no username (issue4211)$HGUSER=$hgamend-e--configui.username=-m"empty user"abort:nousernamesupplied(use'hg config --edit'tosetyourusername)[255]$hgsumparent:7:*tip(glob)logfilemessagebranch:foocommit:1unknown(clean)update:(current)phases:3draftCheckthehelp$hgamend-hhgamend[OPTION]...[FILE]...aliases:refreshcombineachangesetwithupdatesandreplaceitwithanewoneCommitsanewchangesetincorporatingboththechangestothegivenfilesandallthechangesfromthecurrentparentchangesetintotherepository.See'hg commit'fordetailsaboutcommittingchanges.Ifyoudon't specify -m, the parent'smessagewillbereused.If--extractisspecified,thebehaviorof'hg amend'isreversed:Changestoselectedfilesinthecheckedoutrevisionappearagainasuncommittedchangedintheworkingdirectory.Returns0onsuccess,1ifnothingchanged.options([+]canberepeated):-A--addremovemarknew/missingfilesasadded/removedbeforecommitting-a--allmatchallfiles-e--editinvokeeditoroncommitmessages--extractextractchangesfromthecommittotheworkingcopy--patchmakechangestowdirparentbyeditingpatch--close-branchmarkabranchasclosed,hidingitfromthebranchlist-s--secretusethesecretphaseforcommitting-n--noteTEXTstoreanoteonamend-I--includePATTERN[+]includenamesmatchingthegivenpatterns-X--excludePATTERN[+]excludenamesmatchingthegivenpatterns-m--messageTEXTusetextascommitmessage-l--logfileFILEreadcommitmessagefromfile-d--dateDATErecordthespecifieddateascommitdate-u--userUSERrecordthespecifieduserascommitter-D--current-daterecordthecurrentdateascommitdate-U--current-userrecordthecurrentuserascommitter-i--interactiveuseinteractivemode(somedetailshidden,use--verbosetoshowcompletehelp)