Who here works on Subversion?

[Thomas Charron]

 There is a utility script called 'svnmerge' that now ships with subversion,
and can also be downloaded externally. It has recently also been made
available as a python script. It handles exactly the type of merging you're
talking about.

I also use it to handle bidirectional merges, to merge changes from trunk to
a branch, and from a branch, out to trunk.

http://www.dellroad.org/svnmerge/index

Thomas

On 10/2/05, Steven W. Orr <steveo at syslang.net> wrote:
>
> I remember that there were one or two people here who were the sv
> developers. Please write back to me. The idea is that there is a
> deficiency in sv's merge capabilties and I was wondering if this is a
> functional item that is intended to be fixed.
>

..... Text deleted
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.gnhlug.org/mailman/private/gnhlug-discuss/attachments/20051005/3f8e8557/attachment.html