Re: svn info tree conflicts bug using svn 1.10.6?
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
Re: svn info tree conflicts bug using svn 1.10.6?
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(_relpath, + SVN_ERR(svn_client_conflict_get_incoming_new_repos_location(_relpath, _rev, _kind, conflict, ]]] Cheers, -- Yasuhito FUTATSUKI
Re: svn info tree conflicts bug using svn 1.10.6?
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
svn info tree conflicts bug using svn 1.10.6?
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). The results from "svn info" for the conflicted file appear correct. However, "svn info --xml" reports the wrong information for "source-right" (it appears to repeat the information given for "source-left"?). Further details are given below. Is this a known issue? Is it fixed in the latest release? This is the script I've used to reproduce the problem: #!/bin/bash set -eu svn --version | head -1 TEST_DIR=$(mktemp -d) svnadmin create $TEST_DIR/test-repos REPOS_URL="file://$TEST_DIR/test-repos" svn mkdir -q -m "" $REPOS_URL/trunk svn copy -q -m "" $REPOS_URL/trunk@1 $REPOS_URL/branch1 svn copy -q -m "" $REPOS_URL/trunk@1 $REPOS_URL/branch2 svn checkout -q $REPOS_URL/branch1 $TEST_DIR/wc cd $TEST_DIR/wc echo "Test 1" > file svn add -q file svn commit -q -m "" svn switch -q $REPOS_URL/branch2 echo "Test 2" > file svn add -q file svn commit -q -m "" svn update -q svn merge --non-interactive $REPOS_URL/branch1 echo === svn info file svn info file echo === svn info --xml file svn info --xml file cd $OLDPWD rm -rf $TEST_DIR "svn info file" reports the following: ... Tree conflict: local file obstruction, incoming file add upon merge Source left: (none) ^/trunk/file@1 Source right: (file) ^/branch1/file@5 Using svn 1.10.6, "svn info --xml file" reports the following: ... You can see the information for "source-right" is not correct. It works fine with svn 1.9.12: I've tested with other sorts of tree conflict - they all show the same problem. Thanks, David
