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

Re: [PATCH] Pass the name of the conflicted file to the merge tool

From: John Gardiner Myers <jgmyers_at_proofpoint.com>
Date: Fri, 09 Jan 2009 09:41:24 -0800

Julian Foad wrote:
> I would want to check how it affects compatibility,
If an existing external merge tool checks the number of arguments to
ensure there are exactly four, it would have to have this check removed
or changed to ensure there are no fewer than four. I believe this is
reasonable, as the alternative is to add an additional "merge2" config
setting and environment variable to distinguish old and new merge tools.

I plan in the follow-up modification to the Subversion Book to state
that external merge tools need to ignore any additional arguments that
may be added in future versions of Subversion.
> whether there are
> other similar cases that should be handled too (interactive resolution
> has a similar problem, for example,
I don't understand the issue. I believe this change affects all
invocations of the external merge tool, whether interactive or not.
> and I think there's more than one
> place where merge is called, I think) and so on.
I believe there are no issues with respect to merges from "svn merge"
versus "svn update". All invocations should be modified by this patch.

Received on 2009-01-09 22:33:04 CET

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