[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problem with merge --reintegrate

From: Stefan Sperling <stsp_at_apache.org>
Date: Sun, 24 Dec 2017 13:37:11 +0100

On Sun, Dec 24, 2017 at 01:35:35PM +0300, Anton Shepelev wrote:
> Johan Corveleyn:
>
> > This issue seems similar:
> > https://issues.apache.org/jira/plugins/servlet/mobile#issue/SVN-4582
> >
> > I found this in the list of CHANGES [1] for 1.9.0
> > (I went looking there, because I vaguely remem-
> > bered seeing the issue before). So try again with
> > a 1.9.x client, maybe there it's fixed.
>
> The problem is still there with svn client 1.9.7.

If your problem is rooted in issue #4582 then 1.8.x clients have already
created svn:mergeinfo properties which now confuse the reintegrate merge.

Update *all* your clients to 1.9.7, and the issue should disappear
with new branches created and managed with these up-to-date clients.

You can keep using your workaround (expand the working copy entirely)
for all existing branches.

In case the problem re-appears with a branch that was only touched
by 1.9.7 clients, please let us know.

> I did not upgrade any server components though. Is it
> a dangerous operation?

It is not dangerous. Subversion has excellent backwards compatibility.
The server will always be able to work with repository data from
older releases without any problems.

You may not need to upgrade your server for this specific problem,
however I would still recommend an upgrade. 1.9.7 is _very_ stable
and contains a few years worth of bug fixes which aren't part of 1.8.x.
See http://subversion.apache.org/docs/release-notes/1.9.html
for the release notes of the 1.9 release, and in particular note the section
on compatibility which explains how to upgrade:
http://subversion.apache.org/docs/release-notes/1.10.html

Also note that 1.8.x will be in end of line status as soon as 1.10.0 is
released. There is no fixed date yet but we're currently aiming to release
1.10.0 in January 2018. The release notes for this release are here:
http://subversion.apache.org/docs/release-notes/1.10.html
Received on 2017-12-24 13:37:38 CET

This is an archived mail posted to the Subversion Users mailing list.