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

Re: Evil twin bug ?

From: Blair Zajac <blair_at_orcaware.com>
Date: 2006-08-25 03:14:16 CEST

Lakshman Srilakshmanan wrote:
> But I do take your point I could use " Python script svnmerge.py". I
> made a conscious decision not to use this as I read on this user forum
> that it is not endorsed by the custodians of Subversion. I would rather
> wait for subversion to have a supported feature than introduce a third
> party tool that is not supported by CollabNet.

Where did you hear that? It's being used on the 1.4.x branch.

Take a look at the third paragraph here:


Trust me, your life will be much easier with svnmerge.py. I'm recommending that
anybody that does merging on a consistent basis use it.

And yes, I'm hoping that 1.5.x will have the merge tracking built in.


Blair Zajac, Ph.D.
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 25 03:17:20 2006

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.