[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:18:54 CET

On Thu, 08 Nov 2007, Justin Erenkrantz wrote:

> On Nov 8, 2007 1:02 PM, David Glasser <glasser@davidglasser.net> wrote:
> > Actually, I added that because I found that the driver code in
> > svnmerge.py couldn't handle *any* requirement from input, but rather
> > would hang. A better solution would just to be to rewrite the
> > command-running code in svnmerge.py to actually let the user
> > interact...
>
> Well, auth prompting works for me sans interactive conflicts... -- justin

Or, hey! Drop it in favor of Subversion 1.5 Merge Tracking.

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

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