Re: svn info tree conflicts bug using svn 1.10.6?

2021-01-19 Thread Nathan Hartman 
On Tue, Jan 19, 2021 at 12:45 PM Matthews, David
 wrote:
>
> I appear to be getting incorrect results reported by "svn info --xml" for a 
> file which has tree conflicts.
>
> I'm testing with svn 1.10.6 (and 1.9.12 which doesn't have this problem).

Without digging deeper yet, I see it with 1.13.0 as well: 'svn info'
output is correct, but with '--xml' it shows the wrong right side of
conflict.

Thanks for the reproduction script and version numbers. This
information is extremely helpful. I'll let you know what I find...

Nathan

Re: svn info tree conflicts bug using svn 1.10.6?

2021-01-19 Thread Yasuhito FUTATSUKI 
In article 
hartman.nat...@gmail.com writes:

> On Tue, Jan 19, 2021 at 12:45 PM Matthews, David
>  wrote:
> >
> > I appear to be getting incorrect results reported by "svn info --xml" for a 
> > file which has tree conflicts.
> >
> > I'm testing with svn 1.10.6 (and 1.9.12 which doesn't have this problem).
> 
> Without digging deeper yet, I see it with 1.13.0 as well: 'svn info'
> output is correct, but with '--xml' it shows the wrong right side of
> conflict.

... and trunk r1885656 as well.

Parhaps this will fix it:
[[[
Index: subversion/svn/cl-conflicts.c
===
--- subversion/svn/cl-conflicts.c   (revision 1885656)
+++ subversion/svn/cl-conflicts.c   (working copy)
@@ -452,7 +452,7 @@
  repos_root_url, repos_relpath, peg_rev,
  node_kind, pool));
 
-  SVN_ERR(svn_client_conflict_get_incoming_old_repos_location(&repos_relpath,
+  SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(&repos_relpath,
   &peg_rev,
   &node_kind,
   conflict,
]]]

Cheers,
-- 
Yasuhito FUTATSUKI

Re: svn info tree conflicts bug using svn 1.10.6?

2021-02-14 Thread Nathan Hartman 
On Tue, Jan 19, 2021 at 12:45 PM Matthews, David <
david.matth...@metoffice.gov.uk> wrote:

> I appear to be getting incorrect results reported by "svn info --xml" for
> a file which has tree conflicts.
>
> I'm testing with svn 1.10.6 (and 1.9.12 which doesn't have this problem).
>

Hello,

Just following up to let you know that the above bug is fixed in svn 1.10.7
and 1.14.1, both of which were released last week.

Cheers,
Nathan