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

Re: Reintegration problem

From: David Aldrich <david.aldrich.ntml_at_gmail.com>
Date: Fri, 18 Jan 2019 14:51:40 +0000

Hi Stefan

Thanks again for your help. We decided to manually reintegrate the branch
using a file compare tool as the differences were small. We've created a
new branch, so hopefully we will not see this problem again.

Best regards


On Fri, Jan 18, 2019 at 1:57 PM Stefan Sperling <stsp_at_elego.de> wrote:

> On Fri, Jan 18, 2019 at 01:09:19PM +0000, David Aldrich wrote:
> > Hi Stefan
> >
> > Thanks for your reply. I am using svn 1.11.
> >
> > I tried the command you suggested but, although it succeeded, there was
> > nothing to commit afterwards.
> Does the file not have an svn:mergeinfo property?
> Otherwise, what does svn:mergeinfo on this file contain?
> Does it already mention the missing path/revision?
Received on 2019-01-18 15:52:01 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.