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

Re: [PATCH] Add option to resolve conflicts by selecting a specific file (Issue 2784)

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-06-01 05:21:13 CEST

On 5/31/07, Jeremy Whitlock <jcscoobyrs@gmail.com> wrote:
> Hi All,
> Attached is the patch used to resolve issue 2784. Here is a synopsis:
> This patch adds the "--accept" or "-a" flag support to the Subversion
> command line. Right now, only resolved subcommand is using it. This
> new flag will also be used by the following subcommands:
> merge
> switch
> update
> I will be creating separate issues for each implementation of the
> "--accept" flag for each subcommand and patches will be created for
> each. Working on this also will mean revving the bindings to handle
> this new functionality. Just like with making the other subcommands
> support this flag, each binding will be working on as separate issues.
> All related issues will be created shortly after this email. As for
> the log message for this patch, it will be at the bottom of this
> message. Thanks to all that have helped during this patch.

This is not a patch review.

Sorry to be sending this so late in the process, but I just thought of
it. I even got out of bed to send this before I lose the thought.
Also, I entered this issue and pointed Jeremy at it to see if he was
interested, so it is not like I do not want to see it implemented.

Anyway, in thinking about how this new option would be implemented in
svn merge, it just suddenly occurred to me that we might be doing this

Everything we are doing makes perfect sense if this is a binary file.
But if this is a text file, I am not sure we are doing what a user
would expect.

In my experience, when using a graphical merge tool, it will often
walk you through conflicts. You have various options such as "use
mine" or "use theirs" to resolve each conflict. There is usually an
option to "use mine for all" or "use theirs for all". We are sort of
doing that here.

The difference is that we are not merging the files at all. We are
simply taking one of the three existing versions of the file. I am
not sure that is what a user would expect. Perhaps with the resolved
command it is sort of clear, I am not sure if it is or not. But if I
did this on svn merge, I think I would be expecting it to merge the
files, and use this parameter only to resolve the conflicts it
encounters within the merge.

This leads me to wonder if that is not what should be happening here
as well. If the files are unmergeable (binary) it would do what it is
doing now. But if these are text files, it seems like it ought to
merge them and use this setting to resolve the conflicts it encounters
along the way.

Thoughts? Am I out of my mind?

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 1 05:21:26 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.