test-eol-update: record new results as correct
Changeset
0852da25a31b changed the result of this test. The 'hg update 0'
command, which causes a merge of modified a.txt, now leaves a.txt in the
EOLN format specified by .hgeol as it was committed in revision 0.
Previously, it used the .hgeol contents from the working directory before the
update.
#!/bin/sh
"$TESTDIR/hghave" svn svn-bindings || exit 80
echo "[extensions]" >> $HGRCPATH
echo "convert = " >> $HGRCPATH
echo "graphlog =" >> $HGRCPATH
svnadmin create svn-repo
cat "$TESTDIR/svn/startrev.svndump" | svnadmin load svn-repo > /dev/null
convert()
{
startrev=$1
repopath=A-r$startrev-hg
hg convert --config convert.svn.startrev=$startrev \
--config convert.svn.trunk=branches/branch1 \
--config convert.svn.branches=" " \
--config convert.svn.tags= \
--datesort svn-repo $repopath
hg -R $repopath glog --template '{rev} {desc|firstline} files: {files}\n'
echo
}
echo % convert before branching point
convert 3
echo % convert before branching point
convert 4
echo % convert at branching point
convert 5
echo % convert last revision only
convert 6