Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm
Precedence: bulk
MIME-Version: 1.0
In-Reply-To: <20171123200612.GS88903@ted.stsp.name>
References: <277282b9-aebf-6156-8244-d50c70e9f3af@apache.org>
 <20171122124111.GM88903@ted.stsp.name> <CA+298Ui8swe_pzFTpME4RxpegcijMwZUT2NGE21TiGcOz5XGKw@mail.gmail.com>
 <20171123200612.GS88903@ted.stsp.name>
From: Paul Hammant <paul@hammant.org>
Date: Thu, 23 Nov 2017 15:53:02 -0500
Message-ID: <CA+298Uhn+U5_fLUoQt34mVE9-JynNQYNYe7VqWeqH+-onCTtBg@mail.gmail.com>
Subject: Re: Subversion 1.10 RC1?
To: Svn dev <dev@subversion.apache.org>
Content-Type: multipart/alternative; boundary="001a1141ae58439848055eac9f28"
archived-at: Thu, 23 Nov 2017 20:53:19 -0000

--001a1141ae58439848055eac9f28
Content-Type: text/plain; charset="UTF-8"

>
>
> > Is that a regression versus v1.9 and before?
>
> Far from it.
> This discussion is about the new conflict resovler added in 1.10.
>
> We can and always could perform such merges by manually specifying
> the paths, i.e. running a merge from ^/trunk/B to branch/A.
>
> The goal of the resolver is to make it easier to perform such merges
> in the straightforward 'svn merge ^/trunk' style.
>

OK, so at the risk of representing *the department of unsolicited advice*,
I don't know why you would not ship with as 'off' but able to be toggled
'on' client-side with a new option
--with-experimental-1-10-conflict-enhancement-technology
(or a better name). The 0.1% of users that want to play with it before it
is ready can do.

- Paul

--001a1141ae58439848055eac9f28
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div class=3D"gmail_extra"><div class=3D"gmail_quote"><blo=
ckquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left=
:1px solid rgb(204,204,204);padding-left:1ex"><span class=3D"gmail-"><br>
&gt; Is that a regression versus v1.9 and before?<br>
<br>
</span>Far from it.<br>
This discussion is about the new conflict resovler added in 1.10.<br>
<br>
We can and always could perform such merges by manually specifying<br>
the paths, i.e. running a merge from ^/trunk/B to branch/A.<br>
<br>
The goal of the resolver is to make it easier to perform such merges<br>
in the straightforward &#39;svn merge ^/trunk&#39; style.<br>
</blockquote></div><br>OK, so at the risk of representing <i>the department=
 of unsolicited advice</i>, I don&#39;t know why you would not ship with as=
 &#39;off&#39; but able to be toggled &#39;on&#39; client-side with a new o=
ption --with-experimental-1-10-<span style=3D"color:rgb(80,0,80);font-size:=
12.8px">conflict-enhancement-technology (or a better name). The 0.1% of use=
rs that want to play with it before it is ready can do.</span></div><div cl=
ass=3D"gmail_extra"><span style=3D"color:rgb(80,0,80);font-size:12.8px"><br=
></span></div><div class=3D"gmail_extra"><span style=3D"color:rgb(80,0,80);=
font-size:12.8px">- Paul</span></div></div>

--001a1141ae58439848055eac9f28--