You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by jc...@apache.org on 2017/02/21 22:34:49 UTC
svn commit: r1783953 - /subversion/site/publish/docs/release-notes/1.10.html
Author: jcorvel
Date: Tue Feb 21 22:34:48 2017
New Revision: 1783953
URL: http://svn.apache.org/viewvc?rev=1783953&view=rev
Log:
* publish/docs/release-notes/1.10.html:
(#conflict-resolver): generalize local change "delete directory" to
"delete item".
Modified:
subversion/site/publish/docs/release-notes/1.10.html
Modified: subversion/site/publish/docs/release-notes/1.10.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.10.html?rev=1783953&r1=1783952&r2=1783953&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.10.html (original)
+++ subversion/site/publish/docs/release-notes/1.10.html Tue Feb 21 22:34:48 2017
@@ -383,14 +383,15 @@ which contains at least 2 segments and i
</tr>
<tr>
<td><ul>
- <li>delete directory</li>
+ <li>delete item</li>
</ul></td>
<td><ul>
+ <li>edit file</li>
<li>any change inside directory</li>
</ul></td>
<td>update, switch, merge</td>
<td><ul>
- <li>keep working copy state (deleted directory),<br>
+ <li>keep working copy state (deleted file / directory),<br>
discarding incoming changes</li>
</ul></td>
</tr>
Re: svn commit: r1783953 -
/subversion/site/publish/docs/release-notes/1.10.html
Posted by Stefan Sperling <st...@apache.org>.
On Wed, Feb 22, 2017 at 01:48:27PM +0100, Johan Corveleyn wrote:
> On Wed, Feb 22, 2017 at 1:01 PM, Bert Huijben <be...@qqmail.nl> wrote:
> >> -----Original Message-----
> >> From: jcorvel@apache.org [mailto:jcorvel@apache.org]
> >> Sent: dinsdag 21 februari 2017 23:35
> >> To: commits@subversion.apache.org
> >> Subject: svn commit: r1783953 - /subversion/site/publish/docs/release-
> >> notes/1.10.html
> >>
> >> Author: jcorvel
> >> Date: Tue Feb 21 22:34:48 2017
> >> New Revision: 1783953
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1783953&view=rev
> >> Log:
> >> * publish/docs/release-notes/1.10.html:
> >> (#conflict-resolver): generalize local change "delete directory" to
> >> "delete item".
> >
> > Usually we use the term 'node' to describe 'some thing in the working copy' instead of item.
>
> I just used whatever stsp already used in that table. So, stsp?
>
> IMHO, node sounds a bit too technical for end-users (to me, it sounds
> more like a node in a cluster, or some other infrastructure), and
> since these are the release notes ... But I dunno, doesn't matter too
> much to me.
I have been using "node" as a libsvn_wc-specific term, and "item"
in user-facing documentation.
Re: svn commit: r1783953 - /subversion/site/publish/docs/release-notes/1.10.html
Posted by Johan Corveleyn <jc...@apache.org>.
On Wed, Feb 22, 2017 at 1:01 PM, Bert Huijben <be...@qqmail.nl> wrote:
>> -----Original Message-----
>> From: jcorvel@apache.org [mailto:jcorvel@apache.org]
>> Sent: dinsdag 21 februari 2017 23:35
>> To: commits@subversion.apache.org
>> Subject: svn commit: r1783953 - /subversion/site/publish/docs/release-
>> notes/1.10.html
>>
>> Author: jcorvel
>> Date: Tue Feb 21 22:34:48 2017
>> New Revision: 1783953
>>
>> URL: http://svn.apache.org/viewvc?rev=1783953&view=rev
>> Log:
>> * publish/docs/release-notes/1.10.html:
>> (#conflict-resolver): generalize local change "delete directory" to
>> "delete item".
>
> Usually we use the term 'node' to describe 'some thing in the working copy' instead of item.
I just used whatever stsp already used in that table. So, stsp?
IMHO, node sounds a bit too technical for end-users (to me, it sounds
more like a node in a cluster, or some other infrastructure), and
since these are the release notes ... But I dunno, doesn't matter too
much to me.
--
Johan
RE: svn commit: r1783953 - /subversion/site/publish/docs/release-notes/1.10.html
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: jcorvel@apache.org [mailto:jcorvel@apache.org]
> Sent: dinsdag 21 februari 2017 23:35
> To: commits@subversion.apache.org
> Subject: svn commit: r1783953 - /subversion/site/publish/docs/release-
> notes/1.10.html
>
> Author: jcorvel
> Date: Tue Feb 21 22:34:48 2017
> New Revision: 1783953
>
> URL: http://svn.apache.org/viewvc?rev=1783953&view=rev
> Log:
> * publish/docs/release-notes/1.10.html:
> (#conflict-resolver): generalize local change "delete directory" to
> "delete item".
Usually we use the term 'node' to describe 'some thing in the working copy' instead of item.
Bert