[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: Eric Gillespie <epg_at_pretzelnet.org>
Date: 2007-06-01 21:53:50 CEST

"Mark Phippard" <markphip@gmail.com> writes:

> Famous last words, but I do not see why if we are in the middle of a
> merge process and we detect a conflict and know enough to put markers
> in the file, that it would be that much more difficult to have a flag
> that says "nope, just use that version" for this hunk.

Famous last words, indeed :). But it sounds reasonable.

> I guess where I differ from you, is that with the exception of binary
> files, I cannot imagine where the current behavior would ever be
> desirable. Even worse, is that I think the presence of the option
> would create the desire for the hunk-based behavior. What is the use
> case where when merging an entire project if it received a conflict,
> you'd just want to bail on all the merge that could be done and just
> accept one of the revisions in it's entirety?

Release branches (--accept=theirs).

Anyway, as i said, i'm not arguing against the behavior you
describe; i think it's an improvement. But an improvement is all
i see it as.

Eric Gillespie <*> epg@pretzelnet.org
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 1 21:54:19 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.