[Svnmerge] svnmerge.py with Subversion 1.5

[Archie Cobbs]

On Tue, Jan 27, 2009 at 4:12 PM, Jorge Medina <jmedina at e-dialog.com> wrote:

> For those of you that had used svnmerge.py and also upgraded to
> Subversion 1.5, What are you using for merge tracking? Are you using the
> native merge tracking from Subversion 1.5 ? Do you still use svnmerge.py
> ? Are there any advantages on Subversion 1.5 merge tracking
> capabilities?
>

We're using 1.5 (on some machines) but staying with svnmerge for merge
tracking. The main reason is that our merge model is very simple and well
handled by svnmerge: all merges are from the (one) trunk to a (one of
several) branch.

I think there are good reasons to have this simple kind of merge model that
go beyond merge tracking, but that's a different discussion :-)

As far as  I can tell the svn 1.5 properties and the svnmerge properties
pass like ships in the night. So I ignore the svn 1.5 merge stuff. Actually
I find it kind of annoying that anytime you "svn copy" something with 1.5,
it automatically tacks on the "svn:mergeinfo" property and I find myself
deleting these.

-Archie

-- 
Archie L. Cobbs
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20090128/602b58d8/attachment.html>