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

[Daniel Rall]

On Wed, 20 Jun 2007, lsuvkne at onemodel.org wrote:

> [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.

Dustin's observations are quite accurate.

> > 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.

I have a counter-proposal for Dustin, and for Luke (if interested):
Would the two of you be willing to take over maintenance of
svnmerge.py in the svn.collab.net repository?

If so, I will mail you the details off-list.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070621/99b0ac0e/attachment-0002.pgp>