test-convert-svn-sink: rewrite output for svn compatibility
Addition by Patrick Mezard <pmezard@gmail.com>:
* drop 'kind=' lines from svn 1.6 output
--- a/tests/test-convert-svn-sink Sat Apr 11 20:18:51 2009 +0200
+++ b/tests/test-convert-svn-sink Sat Apr 04 20:39:46 2009 -0500
@@ -12,12 +12,12 @@
(
cd $1;
svn up;
- svn st -v | fixpath
+ svn st -v | fixpath | sed 's/ */ /g'
limit=''
if [ $2 -gt 0 ]; then
limit="--limit=$2"
fi
- svn log --xml -v $limit | fixpath | sed 's,<date>.*,<date/>,'
+ svn log --xml -v $limit | fixpath | sed 's,<date>.*,<date/>,' | grep -v 'kind="'
)
}
--- a/tests/test-convert-svn-sink.out Sat Apr 11 20:18:51 2009 +0200
+++ b/tests/test-convert-svn-sink.out Sat Apr 04 20:39:46 2009 -0500
@@ -12,11 +12,11 @@
1 add a file
0 modify a file
At revision 2.
- 2 2 test .
- 2 2 test a
- 2 1 test d1
- 2 1 test d1/d2
- 2 1 test d1/d2/b
+ 2 2 test .
+ 2 2 test a
+ 2 1 test d1
+ 2 1 test d1/d2
+ 2 1 test d1/d2/b
<?xml version="1.0"?>
<log>
<logentry
@@ -63,11 +63,11 @@
converting...
0 rename a file
At revision 3.
- 3 3 test .
- 3 3 test b
- 3 1 test d1
- 3 1 test d1/d2
- 3 1 test d1/d2/b
+ 3 3 test .
+ 3 3 test b
+ 3 1 test d1
+ 3 1 test d1/d2
+ 3 1 test d1/d2/b
<?xml version="1.0"?>
<log>
<logentry
@@ -101,12 +101,12 @@
converting...
0 copy a file
At revision 4.
- 4 4 test .
- 4 3 test b
- 4 4 test c
- 4 1 test d1
- 4 1 test d1/d2
- 4 1 test d1/d2/b
+ 4 4 test .
+ 4 3 test b
+ 4 4 test c
+ 4 1 test d1
+ 4 1 test d1/d2
+ 4 1 test d1/d2/b
<?xml version="1.0"?>
<log>
<logentry
@@ -140,11 +140,11 @@
converting...
0 remove a file
At revision 5.
- 5 5 test .
- 5 4 test c
- 5 1 test d1
- 5 1 test d1/d2
- 5 1 test d1/d2/b
+ 5 5 test .
+ 5 4 test c
+ 5 1 test d1
+ 5 1 test d1/d2
+ 5 1 test d1/d2/b
<?xml version="1.0"?>
<log>
<logentry
@@ -174,11 +174,11 @@
converting...
0 make a file executable
At revision 6.
- 6 6 test .
- 6 6 test c
- 6 1 test d1
- 6 1 test d1/d2
- 6 1 test d1/d2/b
+ 6 6 test .
+ 6 6 test c
+ 6 1 test d1
+ 6 1 test d1/d2
+ 6 1 test d1/d2/b
<?xml version="1.0"?>
<log>
<logentry
@@ -203,9 +203,9 @@
converting...
0 add executable file in new directory
At revision 1.
- 1 1 test .
- 1 1 test d1
- 1 1 test d1/a
+ 1 1 test .
+ 1 1 test d1
+ 1 1 test d1/a
<?xml version="1.0"?>
<log>
<logentry
@@ -230,11 +230,11 @@
converting...
0 copy file to new directory
At revision 2.
- 2 2 test .
- 2 1 test d1
- 2 1 test d1/a
- 2 2 test d2
- 2 2 test d2/a
+ 2 2 test .
+ 2 1 test d1
+ 2 1 test d1/a
+ 2 2 test d2
+ 2 2 test d2/a
<?xml version="1.0"?>
<log>
<logentry
@@ -280,12 +280,12 @@
0 merge
% expect 4 changes
At revision 4.
- 4 4 test .
- 4 3 test b
- 4 2 test left-1
- 4 3 test left-2
- 4 4 test right-1
- 4 4 test right-2
+ 4 4 test .
+ 4 3 test b
+ 4 2 test left-1
+ 4 3 test left-2
+ 4 4 test right-1
+ 4 4 test right-2
<?xml version="1.0"?>
<log>
<logentry