Re: Evil twin bug ?

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:

http://svn.collab.net/repos/svn/branches/1.4.x/STATUS

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.

Regards,
Blair

-- 
Blair Zajac, Ph.D.
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org