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

Re: svn resolve: just what does it do?

From: Colin Putney <cputney_at_whistler.net>
Date: 2002-03-15 21:55:44 CET

On Friday, March 15, 2002, at 12:26 PM, Zack Weinberg wrote:

> I was just about to post a request for the same exact semantics. I'd
> add only one thing:
>
> If svn resolve is invoked with no arguments, it operates iteratively
> on all conflicted files below the current working directory.
>
> (hence you can just go "svn resolve" at top level and do everything at
> once).

Yup. The --recurse-depth option proposed for other commands would be
handy here too.

> It would be nifty if svn resolve could be told "if there is a conflict
> in a file named "configure", first resolve any conflicts in files
> named "configure.in", "aclocal.m4", ..., then run autoconf in the same
> directory" -- but that might be excessive features. Certainly not for
> cut 1 of interactive resolve.

I think the cost/benefit ratio of this feature doesn't make it worth
doing, even post-1.0. It's not that much work for the user to do 'svn
resolve configure.in && autoconf'. Conversely, dependency analysis would
be a fairly large job to implement, and outside the scope of a version
control tool.

I wonder if you could define a sort of backwards make rule that would be
triggered by the *existence* of a target and be invoked to remove it.
Then you could make configure.in depend on the absence of
configure.in.rej for example.

Cheers,

Colin

Colin Putney www.whistler.com
Information Systems (877) 932-0606
Whistler.com (604) 935-0035 x221

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 15 21:56:30 2002

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