[jira] [Closed] (SVN-3494) moving a branch stumps svnmerge.py

"Daniel Sahlberg (Jira)" <[email protected]> Tue, 11 Jan 2022 18:20:00 +0000 (UTC)
Newsgroups gmane.comp.version-control.subversion.issues
Message-ID <[email protected]>
     [ https://issues.apache.org/jira/browse/SVN-3494?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Daniel Sahlberg closed SVN-3494.
--------------------------------
    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.

> moving a branch stumps svnmerge.py
> ----------------------------------
>
>                 Key: SVN-3494
>                 URL: https://issues.apache.org/jira/browse/SVN-3494
>             Project: Subversion
>          Issue Type: Bug
>          Components: contrib/svnmerge.py
>    Affects Versions: 1.6.x
>            Reporter: Benson Margulies
>            Assignee: Blair Zajac
>            Priority: Critical
>             Fix For: nonblocking
>
>
> {noformat:nopanel=true}
> I created a branch, and then regretted its name. So, svn mv oldname newname.
> Now, svnmerge.py can't init to pull changes from 'newname', as it finds the old
> name somewhere and tries to use it.
> {noformat}



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