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

Re: isn't variance adjusted patching horribly dangerous?

From: Josef Wolf <jw_at_raven.inka.de>
Date: 2003-04-18 12:35:18 CEST

On Thu, Apr 10, 2003 at 12:26:13PM +0200, Sander Striker wrote:

> > To reduce unnecessary conflicts apply the v.a.p. as described in Karl's
> > paper. To get the warnings, dump the potentially dangerous hunks along
> > with their patch-results into some "patch.warnings" file and give a
> > warning.
> >
> > This way it would be very easy to check whether the v.a.p. did what you
> > want.
>
> It will be dead easy to create an option to 'merge' which will make it
> less 'aggressive'. I'll come around to that...

This is not what I tried to say. The problem is that with such an
option you need to know _in advance_ which level of aggressivity you
want. When you do it the way I described, you can still run in the
most aggressive mode and decide _afterwards_ (when you've seen the
results) which hunks you would like to merge in a less aggressive
mode (or merge by hand).

-- 
-- Josef Wolf -- jw@raven.inka.de --
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 18 12:37:03 2003

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