subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Aldrich <david.aldrich.n...@gmail.com>
Subject Re: Reintegration problem
Date Fri, 18 Jan 2019 14:51:40 GMT
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

David

On Fri, Jan 18, 2019 at 1:57 PM Stefan Sperling <stsp@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?
>

Mime
View raw message