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

Re: Merging the svndiff-patch branch to trunk

From: Charles Acknin <charlesacknin_at_gmail.com>
Date: 2007-10-05 04:28:57 CEST

On 10/5/07, Hyrum K. Wright <hyrum_wright@mail.utexas.edu> wrote:
> Hash: SHA1
> Hi all.
> Just wondering where we're at in the process of merging the
> svndiff-patch branch to trunk. It'd be good to get it there so others
> can start playing with it, and to get it into the 1.5 release. I'd hate
> to have to wait until 1.6 to release code from SoC '07.
> I know that Charles has been working on the branch a bit lately.
> Charles, what would it take to get it mergeable, and do you think you
> can have that ready in the next day or two?

I meant to let people know in the next few days about how the
svnpatch-diff branch is doing. But I'll take the opportunity of your
post to do it right away.

While there's still some work to be done, I think the branch is quite
ready for merging back to trunk. It's just that I'm not sure whether
we want this for 1.5 or not, as I've been hearing both 'for' and
'against' opinions. So in the meantime I endeavor to make the branch
as stable as possible before we reach consensus on that point.

BTW, the branch got some code review (thanks glasser :-) on some of
the last svnpatch-diff commits, and malcolm might have had a look at
the branch too during GSoC, but I think it's fairly far from covering
the whole branch work.

As for the work left to be done, I'm currently working on it. Here's
a task list that I have in mind for those interested with details:

  * file move operations: a move operation is represented with an
add-with-history and a del. Because we're driving the editor in a
depth-first manner, it may occur that the del precedes the
add-with-history. It turns out to be a problem since the
add-with-history is precisely a file copy of the file which the del
command just deleted. I have some code partly working that I'll
commit soon (next 24h hopefully). It involves maintaining a list of
schedule-delete files and using the on-delete-keep-local feature to
defer disk file deletion until after the copy is actually made.

 * directory copy and move operations: basically carefully
duplicate/use file's code with a 'recursive' flavor.

  * ensure fuzzing is working as expected, if we can say so. (I've
already tried svnpatch fuzzing but I'm sure it needs more testing as
really anything can happen)

  * write some more patch_tests.py tests

And possibly:

  * copyfrom information: I was able to generate copyfrom-enabled
patch for wc/wc diffs, but since the server doesn't send this copyfrom
information both wc/repos and repos/wc diffs lack this feature. This
needs some work on all three RA implementations I guess, in a similar
way to sussman's recent work on copyfrom stuff for updates.

Hope it helps see the overall picture of this branch.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 5 04:29:07 2007

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.