[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 20:57:34 CEST

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

> 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?

I've proposed this feature in a couple different forms over the
years ;->. The most recent proposal was inspired by Perforce's
-am, -ay, and -at options: --accept={merged,yours,theirs} . And,
all i was looking for is what Jeremy has implemented. That's
also all Perforce implements.

Now, if it's possible for us to do even better, and do this at
the individual patch hunk level, even better! I think that is a
much bigger chunk of work, though.

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 20:57:47 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.