[Svnmerge] [PATCH] preserving mods to renamed files/directories

[lsuvkne at onemodel.org]

[resending--forgot to cc: list]
>>> On Tue, Jun 19, 2007  "Dustin J. Mitchell" <dustin at zmanda.com> wrote:
> I will take a look at the patch when I get a chance, but I have some
> initial reactions to your post:

Thanks for your comments, including your point about developer interest at the
moment.

> FYI, the developers there have pretty much ignored my repeated attempts
> to submit patches.  They're all working on Subversion 1.5, which has
> merge tracking built in, and I think svnmerge.py is not even interesting
> enough to read a patch for.

Even if they don't have time right now, I think something along these lines
would be useful even after 1.5 is released, because the merge
tracking won't solve the "atomic renames + merge = overwrite" problem.
Subversion 1.5 may eliminate the
need for the existing svnmerge, but the preservation of file changes across
renames will still be needed. If we are very lucky it won't be needed after
1.6, but I think no one knows for sure right now, and history suggests
not to hold our breath, due to the complexity of atomic renames.

> I don't want to foment a rebellion, but is it feasible to propose a
> fork?  That is, to move the snvmerge directory out of the svn.tigris.org
> and to SourceForge or Google Code or something?

Thanks for volunteering; I'd be interested in a fork, even a
temporary one, if we  can't get svn committer interest.
I'm also discussing subversion issues #2282 and 2685
but don't have a good guess on what can be done
short-term.  If we fork though, it may be less
beneficial to users who won't know where to look for it,
unless we prominently updated the oraware wiki or something.
Hm.

Only to help me plan, I wonder:  Should I wait for your review before sending
on to the dev list?  How long would you guess before you'll have a chance?

(Right after my original post with the patch, I changed the version #
in the startup check from 2.0 to 2.4, but haven't tested it yet.)

Thanks again, & best regards,

-Luke Call