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

Interactively postpone all remaining conflicts?

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-11-06 07:28:17 CET

I recently did a massive merge, and by about the 10th conflict prompt...

   Conflict discovered in 'subversion/libsvn_ra_local/ra_plugin.c'.
   Select: (p)ostpone, (d)iff, (e)dit, (h)elp for more options : h
     (p)ostpone - mark the conflict to be resolved later
     (d)iff - show all changes made to merged file
     (e)dit - change merged file in an editor
     (r)esolved - accept merged version of file
     (m)ine - accept my version of file
     (t)heirs - accept their version of file
     (l)aunch - use third-party tool to resolve conflict
     (h)elp - show this list

...I really wanted an option for "postpone all". (For that matter,
there might be circumstances where "resolve all", "use mine for all",
etc might be useful, but probably "postpone all" would be the common
case. If we want to generalize it, then maybe "*", as in "LETTER*",
could be the trick for the command-line client.)

Thoughts? I have no idea if this would be easy or hard to implement,
I first wanted to get a sense of whether we like it.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 6 07:28:29 2007

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