[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: Daniel Rall <dlr_at_collab.net>
Date: 2007-11-08 19:36:56 CET

On Thu, 08 Nov 2007, Justin Erenkrantz wrote:

> 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...

Okay.

> 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

Revision blocking, and some of the log + diff options, are the only
ones that won't make it. However, you can simulate revision blocking
using 'svn merge --record-only', with a separate list (e.g. possibly
in another property) to track revisions which are marked as merged to
simulate blocking.

  • application/pgp-signature attachment: stored
Received on Thu Nov 8 20:36:20 2007

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