[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:33:25 CEST

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

> We discussed a bit on IRC. I'd say the conclusion was that the
> current approach is good for resolved command, but for the others, it
> would need to be a hunk-based approached where this option only
> applied to the hunks that were in conflict. Here is a transcript:

Unless i'm missing something, i understood correctly. I still
don't see why it *needs* to be hunk-based, even for
merge/update/switch. I'm certainly not opposed to that
improvement! But, are we letting the perfect be the enemy of the
good? Or maybe handling it by hunk is easier than i think.

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:33:35 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.