On Thu, Apr 09, 2015 at 05:49:19PM +0200, Marc Strapetz wrote:
> For a working copy which has been checked out using SVN 1.8, "svn info"
> output is slightly different between version 1.8 and 1.9 -- for 1.9 the
> local *dir* is missing.
>
> For 1.8:
>
> $ svn info a/b
> Path: a\b
> Name: b
> Repository Root: ...
> Repository UUID: ...
> Node Kind: none
> Schedule: normal
> Tree conflict: local *dir* missing, incoming dir edit upon merge
> Source left: (dir) ^/trunk/a/b_at_1
> Source right: (dir) ^/branch/a/b_at_4
>
> For 1.9:
>
> $ svn info a/b
> Path: a\b
> Name: b
> Repository Root: ...
> Repository UUID: ...
> Node Kind: none
> Schedule: normal
> Tree conflict: local missing or deleted or moved away, incoming dir edit
> upon merge
> Source left: (dir) ^/trunk/a/b_at_1
> Source right: (dir) ^/branch/a/b_at_4
>
> In terms of JavaHL this means that for version 1.8:
>
> info.conflicts[0].nodeKind="dir"
>
> while for version 1.9:
>
> info.conflicts[0].nodeKind="none"
>
> I can provide a test repository to reproduce this difference.
>
> -Marc
The 1.8 implementation was confused because there are sometimes mulitple
'kinds' involved in tree conflicts because there are multiple sides
with different kinds.
The kind shown is the local kind. 1.8 was wrong.
Received on 2015-04-09 18:00:42 CEST