This was a mistake and is fixed now.
On Wed, Mar 2, 2022 at 4:21 PM David Aldrich
wrote:
> Hi
>
> I am trying to reintegrate a branch into the trunk.
>
> I first merged trunk to branch, which was committed at r16824.
>
> I then merged trunk to branch:
>
> svn merge --reintegrate ^/MyRepo>/branch
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 wrote:
>
On Fri, Jan 18, 2019 at 01:09:19PM +, 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, wha
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.
best regards
David
On Fri, Jan 18, 2019 at 12:58 PM Stefan Sperling wrote:
> On Fri, Jan 18, 2019 at 12:31:12PM +, David Aldrich wro
On Fri, Jan 18, 2019 at 12:31:12PM +, David Aldrich wrote:
> Hi
>
> I have a branch to which I have carefully merged all changes from the trunk
> over the past year. Today I want to reintegrate the branch into the trunk.
> When I attempt to do so I get error:
>
> Reintegrate can only be used
