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

Re: --no-interactive-conflicts was Re: Interactively postpone all remaining conflicts?

From: Justin Erenkrantz <justin_at_erenkrantz.com>
Date: 2007-11-08 19:23:44 CET

On Nov 8, 2007 1:18 PM, Daniel Rall <dlr@collab.net> wrote:
> Or, hey! Drop it in favor of Subversion 1.5 Merge Tracking.

They aren't compatible - and, sadly, many folks won't upgrade their
servers until x.y.1 comes out. So, for devs like me, I'm stuck in the
middle using svnmerge.py for a while with a trunk client...

And, AIUI, not all features of svnmerge.py will make it into 1.5 -
such as block. Or, should it be have feature parity by the time we
branch? -- justin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 8 20:26:30 2007

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