Mercurial > hg
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
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 21 Dec 2007 12:07:02 +0100 |
parents | cc3af86ab6fe |
children | 57d29a45ffbc |
comparison
equal
deleted
inserted
replaced
5643:eae4553b2763 | 5667:f29b7c8419cb |
---|---|
24 echo a > a | 24 echo a > a |
25 darcs record -a -l -m p0 | 25 darcs record -a -l -m p0 |
26 cd .. | 26 cd .. |
27 | 27 |
28 echo % branch and update | 28 echo % branch and update |
29 darcs get darcs-repo darcs-clone | 29 darcs get darcs-repo darcs-clone >/dev/null |
30 cd darcs-clone | 30 cd darcs-clone |
31 echo c >> a | 31 echo c >> a |
32 echo c > c | 32 echo c > c |
33 darcs record -a -l -m p1.1 | 33 darcs record -a -l -m p1.1 |
34 cd .. | 34 cd .. |
48 glog() | 48 glog() |
49 { | 49 { |
50 hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@" | 50 hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@" |
51 } | 51 } |
52 | 52 |
53 hg convert darcs-repo darcs-repo-hg | 53 hg convert darcs-repo darcs-repo-hg 2>&1 | grep -v hGetLine | grep -v '^$' |
54 # The converter does not currently handle patch conflicts very well. | 54 # The converter does not currently handle patch conflicts very well. |
55 # When they occur, it reverts *all* changes and moves forward, | 55 # When they occur, it reverts *all* changes and moves forward, |
56 # letting the conflict resolving patch fix collisions. | 56 # letting the conflict resolving patch fix collisions. |
57 # Unfortunately, non-conflicting changes, like the addition of the | 57 # Unfortunately, non-conflicting changes, like the addition of the |
58 # "c" file in p1.1 patch are reverted too. | 58 # "c" file in p1.1 patch are reverted too. |