[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: Anton Shepelev <anton.txt_at_gmail.com>
Date: Sun, 24 Dec 2017 15:56:56 +0300

Stefan Sperling to Anton Shepelev:

> > 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.

Thank you, Stefan, I will.

-- 
Please, do not forward replies to my e-mail.
Received on 2017-12-24 13:57:12 CET

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