[jira] [Closed] (SVN-3446) svnmerge.py puts a file in a conflicted state although one way hasn't changed (keyword substitution)

["Daniel Sahlberg (Jira)" <ji...@apache.org>]

     [ https://issues.apache.org/jira/browse/SVN-3446?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Daniel Sahlberg closed SVN-3446.
--------------------------------
    Resolution: Won't Fix

Described in dev@ by Johan Corveleyn ([https://lists.apache.org/thread/2w1o5dzqbpbg5rjbbwltcnf7m535zmg2):]

 

[close as "invalid"], or as "won't fix", because svnmerge.py is part of contrib, and
contrib is not supported anymore (not by the Subversion community
anyway) – and in any case svnmerge.py is deprecated I think. IIRC,
svnmerge.py was a script that did some form of merge tracking, before
the core implementation arrived in Subverison 1.5.

Out of curiosity I've taken a quick look in its documentation: the
README ([https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/svnmerge/svnmerge.README])
refers to a wiki page that still exists:
[https://www.orcaware.com/svn/wiki/Svnmerge.py]. That page contains a
FAQ entry:
[[[
How do I migrate from svnmerge.py to Subversion 1.5's Merge Tracking?
Use svnmerge-migrate-history.py to convert the merge history written
by svnmerge.py into Subversion 1.5's format.
]]]

In any case I think it's pretty OK to close all outstanding issues
about svnmerge.py.

> svnmerge.py puts a file in a conflicted state although one way hasn't changed (keyword substitution)
> ----------------------------------------------------------------------------------------------------
>
>                 Key: SVN-3446
>                 URL: https://issues.apache.org/jira/browse/SVN-3446
>             Project: Subversion
>          Issue Type: Bug
>          Components: contrib/svnmerge.py
>    Affects Versions: 1.6.x
>         Environment: Linux
>            Reporter: Subversion Importer
>            Priority: Critical
>             Fix For: nonblocking
>
>         Attachments: 1_wikiplugin_group.php
>
>
> {noformat:nopanel=true}
> TikiWiki currently has a modules-doc branch with a
> lib/wiki-plugins/wikiplugin_group.php which you can see on
> http://tikiwiki.svn.sourceforge.net/viewvc/tikiwiki/branches/experimental/modules-doc/lib/wiki-plugins/wikiplugin_group.php?view=log
> Although wikiplugin_group.php did not change on the branch (since the branch's
> creation), svn merge marks it as conflicted when merging from trunk. Of course,
> svn should just adopt trunk's version, but instead, 2 of the first lines are
> marked as conflicting. I shall remember to attach the resulting file.
> I first experienced this problem when running 1.5.6, but I can still reproduce
> with Debian's 1.6.3dfsg-1.
> On trunk, only 1 modification happened since the branch's creation. The trick is
> that it changed both the content and the svn:keywords property, from
> "Id"
> to
> Id
> (it was originally broken). The first line marked as conflicted is an Id line -
> so it's keyword substitution that must be confusing svn.
> The branches look like this:
> $ svn log lib/wiki-plugins/wikiplugin_group.php --stop-on-copy
> ------------------------------------------------------------------------
> r19946 | lphuberdeau | 2009-07-06 08:04:54 -0400 (lun 06 jui 2009) | 1 ligne
> [BRANCH] Creation, trunk 0 to 19945
> ------------------------------------------------------------------------
> chealer@vinci:/var/www/tiki/modules-doc$
> $ svn log -r19945:HEAD lib/wiki-plugins/wikiplugin_group.php
> ------------------------------------------------------------------------
> r20227 | luciash | 2009-07-19 16:03:56 -0400 (dim 19 jui 2009) | 1 ligne
> [ENH] Group wikiplugin: new param to allow only friends of specified user(s) to
> view the rendered content
> ------------------------------------------------------------------------
> chealer@vinci:/var/www/tiki/trunk$
> This should be easy to reproduce:
> svn co
> https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/branches/experimental/modules-doc/lib/wiki-plugins/
> cd wiki-plugins/
> svn merge
> https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/trunk/lib/wiki-plugins/
> svn status wikiplugin_group.php
> This report is written as of r20289 - I should soon perform the merge anyway.
> After that, make sure to checkout r20289 to see the problem.
> {noformat}
> http://tikiwiki.svn.sourceforge.net/viewvc/tikiwiki/branches/experimental/modules-doc/lib/wiki-plugins/wikiplugin_group.php?view=log
> Original issue reported by *chealer*



--
This message was sent by Atlassian Jira
(v8.20.1#820001)