Re: merging branches confusion

Irvine, Chuck R [LTD] wrote:
> I have seen an indication that the subversion team is working on
> enhancing subversion's merge capability. Hopefully, it will be history
> sensitive, keeping track of what has been merged so you don't have to.
> As I recall, "better merge support" was one of the original goals of
> subversion. Does anyone know when this functionality might be targeted
> for release?
>
> Until this gets added to Subversion, two options are svnmerge and svk -
> neither of which I've actually tried yet.

There is a branch for this work at

http://svn.collab.net/repos/svn/branches/merge-tracking/

No telling what release it will actually make it into, but it would be possible
for a 1.5 release.

Regards,
Blair

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 16 21:37:50 2006