On Sat, 2008-11-01 at 02:41 +0100, Neels J. Hofmeyr wrote:
>
> 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
> > ================================================================================
> > Status|NEW |RESOLVED
> > --------------------------------------------------------------------------------
> > 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?
It might be logically conceivable, but we must not allow it to happen.
If we were to allow it, we would not be able to cope with the
complexity.
- Julian
> 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.
>
> ~Neels
>
>
> > 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: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-02 20:27:15 CET