On Tue, Jul 27, 2010 at 12:10:55AM +0530, Ramkumar Ramachandra wrote: > Hi Stefan, > > I imported and ran the copy_and_modify test from svnsync. The diff I > get clearly indicates what more needs to be done, and I think this > test is very valuable. Unfortunately, `svn diff` refuses to show me > the dumpfile itself (application/octet-stream), so here's the rest of > the diff along with a log message: > > [[[ > [in subversion/tests/cmdline] > * svnrdump_tests.py > (copy_and_modify): Import new test from svnsync_tests.py. > (test_list): Run this test, but expect it to fail. > * svnrdump_tests_data/copy-and-modify.dump: Add new test data for > copy_and_modify test. > ]]] > > Index: subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump > =================================================================== > Cannot display: file marked as a binary type. > svn:mime-type = application/octet-stream
Just remove the svn:mime-type property from the file, and you should be able to send a complete diff. Thanks, Stefan > Index: svnrdump_tests_data/copy-and-modify.dump > =================================================================== > --- subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump > (revision 979365) > +++ subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump > (working copy) > > Property changes on: > subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump > ___________________________________________________________________ > Added: svn:mime-type > ## -0,0 +1 ## > +application/octet-stream > Index: subversion/tests/cmdline/svnrdump_tests.py > =================================================================== > --- subversion/tests/cmdline/svnrdump_tests.py (revision 979395) > +++ subversion/tests/cmdline/svnrdump_tests.py (working copy) > @@ -98,7 +98,11 @@ def basic_svnrdump(sbox): > def revision0(sbox): > "dump revision zero" > run_test(sbox, dumpfile_name = "revision0.dump") > - > + > +def copy_and_modify(sbox): > + "copy and modify" > + run_test(sbox, "copy-and-modify.dump") > + > ######################################################################## > # Run the tests > > @@ -107,6 +111,7 @@ def revision0(sbox): > test_list = [ None, > basic_svnrdump, > revision0, > + XFail(copy_and_modify), > ] > > if __name__ == '__main__': > > > --- EXPECTED > +++ ACTUAL > @@ -33,11 +33,11 @@ > Node-path: foo.txt > Node-kind: file > Node-action: add > +Prop-delta: true > Prop-content-length: 10 > Text-delta: true > Text-content-length: 4 > Text-content-md5: d41d8cd98f00b204e9800998ecf8427e > -Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 > Content-length: 14 > > PROPS-END > @@ -67,14 +67,10 @@ > Node-action: add > Node-copyfrom-rev: 1 > Node-copyfrom-path: foo.txt > -Text-copy-source-md5: d41d8cd98f00b204e9800998ecf8427e > -Text-copy-source-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 > Text-delta: true > Text-delta-base-md5: d41d8cd98f00b204e9800998ecf8427e > -Text-delta-base-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 > Text-content-length: 19 > Text-content-md5: d2508118d0d39e198d1129d87d692d59 > -Text-content-sha1: e2fb5f2139d086ded2cb600d5a91a196e76bf020 > Content-length: 19 > > SVN modified
