You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@subversion.apache.org by "Nathan Hartman (Jira)" <ji...@apache.org> on 2021/02/07 05:44:00 UTC
[jira] [Resolved] (SVN-4869) 'svn info --xml' on conflicted file
shows wrong 'source-right' of conflict
[ https://issues.apache.org/jira/browse/SVN-4869?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Nathan Hartman resolved SVN-4869.
---------------------------------
Fix Version/s: 1.10.7
1.14.1
Resolution: Fixed
This problem is fixed on trunk in [r1885983|http://svn.apache.org/viewvc?view=revision&revision=1885983].
The fix will be included in 1.15.0.
In addition, the fix has been backported to the 1.10.x and 1.14.x branches (in [r1886044|http://svn.apache.org/viewvc?view=revision&revision=1886044] and [r1886039|http://svn.apache.org/viewvc?view=revision&revision=1886039], respectively) and will be released with 1.10.7 and 1.14.1.
> 'svn info --xml' on conflicted file shows wrong 'source-right' of conflict
> --------------------------------------------------------------------------
>
> Key: SVN-4869
> URL: https://issues.apache.org/jira/browse/SVN-4869
> Project: Subversion
> Issue Type: Bug
> Components: cmdline client
> Affects Versions: 1.10.0
> Reporter: Nathan Hartman
> Priority: Minor
> Fix For: 1.14.1, 1.10.7
>
>
> When a file has a tree conflict, 'svn info' reports the correct left and right sides of conflict, while 'svn info --xml' shows the correct left side but incorrect right side; specifically, it repeats the same information for left and right sides.
> This issue was reported by David Matthews in the users@ mail thread "svn info tree conflicts bug using svn 1.10.6" archived at:
> [https://mail-archives.apache.org/mod_mbox/subversion-users/202101.mbox/%3cCWLP265MB20020002023DA2E042EDFE6AB3A30@CWLP265MB2002.GBRP265.PROD.OUTLOOK.COM%3e]
> and
> [https://lists.apache.org/thread.html/re696b9a171392e96315220eff1e51c4a64d810299ea632951b641b51%40%3Cusers.subversion.apache.org%3E]
> This issue is known to affect 1.10.0 through 1.14.0. The feature works correctly in 1.9.x.
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)