comparison tests/test-convert-darcs @ 5667:f29b7c8419cb

Fix test-convert-darcs output on Debian etch (issue779)

The CR characters of darcs get confused the output.
Additionally this darcs version printed:
darcs: <stdin>: hGetLine: end of file

5643:eae4553b2763

echo a > a
darcs record -a -l -m p0
cd ..

echo % branch and update
darcs get darcs-repo darcs-clone
cd darcs-clone
echo c >> a
echo c > c
darcs record -a -l -m p1.1
cd ..

glog()
{
    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
}

hg convert darcs-repo darcs-repo-hg
# The converter does not currently handle patch conflicts very well.
# When they occur, it reverts *all* changes and moves forward,
# letting the conflict resolving patch fix collisions.
# Unfortunately, non-conflicting changes, like the addition of the
# "c" file in p1.1 patch are reverted too.

5667:f29b7c8419cb

echo a > a
darcs record -a -l -m p0
cd ..

echo % branch and update
darcs get darcs-repo darcs-clone >/dev/null
cd darcs-clone
echo c >> a
echo c > c
darcs record -a -l -m p1.1
cd ..

glog()
{
    hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
}

hg convert darcs-repo darcs-repo-hg 2>&1 | grep -v hGetLine | grep -v '^$'
# The converter does not currently handle patch conflicts very well.
# When they occur, it reverts *all* changes and moves forward,
# letting the conflict resolving patch fix collisions.
# Unfortunately, non-conflicting changes, like the addition of the
# "c" file in p1.1 patch are reverted too.