[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

some svnpatch-diff branch moves

From: Charles Acknin <charlesacknin_at_gmail.com>
Date: Wed, 25 Jun 2008 15:34:30 +0200

There's recently been a couple moves from danielsh and Arfrever
willing to push forward the svnpatch-diff branch towards the ultimate
goal of its merging back to trunk I believe. I cannot guarantee a
huge amount of time on my side as I'm writing my MS dissertation, but
I'm certainly available to help. What this branch needs is some
review + testing and so every piece of help is greatly appreciated.
The entry point is notes/svnpatch.

danielsh has helped testing on a windows platform which is a good
thing as I've been working solely on linux. He encountered an issue
with the first subtest of diff_tests 42 that deals with binary files.
Specifically the 'iota' file is turned binary and is being appended
some bytes that include EOL tokens. On a windows platform, CRLF is
appended, LF on a unix system, and so on. From what I understand,
Subversion will not perform any translation on binary files. That
means platform dependent EOL markers are buried into the file and
causes the svnpatch to be different as a result of different txdeltas.
 I understand that a binary file may contain EOL markers all over the
place and that Subversion must not perform any translation here, but
this still seams like a perfectly valid edge-case to me. For
instance, what if I `echo "a\nb\nc\n" >> iota; svn ps svn:mime-type
application/octet-stream; svn ci` ? Clearly on linux this is going to
commit LF markers and CRLF on windows. We've tried not to involve EOL
tokens in 'iota' changes and of course the problem goes away and all
the tests pass. But it's rather "we go away from the problem", we're
not fixing it.

A few compilation warnings due to the last sync with trunk and
overlapping rev-up remain to be fixed. The earlier we can get this
branch back to trunk the better with more testers. It is a pain to
sync and fix rev' conflicts too.

I also have a drafty patch to fix the directory move operation which
is buggy in some precise context I've already talked about (the Delete
performed before the Add+). But I'm not yet happy with it.


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-25 15:35:00 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.