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

Re: Interactively postpone all remaining conflicts?

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-11-08 00:28:48 CET

On Tue, 06 Nov 2007, Karl Fogel wrote:

> Daniel Rall <dlr@collab.net> writes:
> > Until we can more gracefully support the case where a merge conflict
> > occurs before the final pass of a multi-pass 'merge' operation, I
> > hesitate to offer this feature for 'merge'. And while it might be
> > convenient now if we could determine that a merge required only a
> > single pass (using a callback from the cmdline-client into
> > libsvn_client), this would result in a UI inconsistency.
>
> Given this, I agree -- let's not try for it in 1.5. If people really
> want it, we'll hear about it, and maybe we'll feel differently about
> automatic continuation in multi-pass merges even over conflicts by
> then. (Don't ask me why, we just might.)

Fine with me. Should an issue be filed so that it's not forgotten?

  • application/pgp-signature attachment: stored
Received on Thu Nov 8 00:29:03 2007

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