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

Re: [Issue 3145] svn resolve[d] should be aware of all the different types of conflicts

From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Sat, 01 Nov 2008 02:41:07 +0100

julianfoad_at_tigris.org wrote:
> http://subversion.tigris.org/issues/show_bug.cgi?id=3145
> User julianfoad changed the following:
> What |Old value |New value
> ================================================================================
> --------------------------------------------------------------------------------
> Resolution| |WONTFIX
> --------------------------------------------------------------------------------
> ------- Additional comments from julianfoad_at_tigris.org Thu Oct 30 06:55:06 -0700 2008 -------
> On a single victim, if there is a tree conflict there cannot also be a text
> and/or property conflict,

Is that really so?
What if I've got a text conflict and merge again? Will it skip the
text-conflicted nodes? Ok, then, what if I send this --ignore-conflicts flag
we were discussing somewhere and merge anyway. Then we may well pile another
conflict on top of a text/prop conflict, regardless. If I got it right.

Still I'm +1 on getting this issue out of the way because it mentions three
different things on my last count. It's too general and needs separate
replacements, if not there already.


> so there is no need to be able to mark different types
> of conflict as resolved separately.
> (One could request to be able to mark text or property conflicts separately as
> resolved on a file, but I do not see a real need for that and that is not what
> this issue was created for.)
> To address the second comment, "svn resolved" will be changed to operate on a
> single victim path - see issue #3306.
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: issues-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: issues-help_at_subversion.tigris.org

Received on 2008-11-01 02:41:50 CET

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.