facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
The CR characters of darcs get confused the output.
Additionally this darcs version printed:
darcs: <stdin>: hGetLine: end of file
This commit is contained in:
Thomas Arendsen Hein 2007-12-21 12:07:02 +01:00
parent 69c7eeabfc
commit 98901c4f4d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test-convert-darcs
View File

@ -26,7 +26,7 @@ darcs record -a -l -m p0
cd ..
echo % branch and update
darcs get darcs-repo darcs-clone
darcs get darcs-repo darcs-clone >/dev/null
cd darcs-clone
echo c >> a
echo c > c
@ -50,7 +50,7 @@ glog()
hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
}
hg convert darcs-repo darcs-repo-hg
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.

2
tests/test-convert-darcs.out
View File

@ -1,8 +1,6 @@
% initialize darcs repo
Finished recording patch 'p0'
% branch and update
Copying patch 1 of 1... Copying patch 1 of 1... done.
Finished getting.
Finished recording patch 'p1.1'
% update source
Finished recording patch 'p1.2'