Home/ Questions/Q 99443
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-11T00:23:19+00:00

I’m evaluating subversion’s branch/merge capabilities, and I decided to do a simple test –

  • 0

I’m evaluating subversion’s branch/merge capabilities, and I decided to do a simple test – I branched an existing project, changed a comment in one file, and then did a merge reintegrate via Tortoise.

It failed:

Command: Reintegrate merge https://oscar/svn/Baxtech/ViM/Branches/Test3 into C:\Inntec\VS2008\Baxtech\ViM
Error: Cannot reintegrate from ‘https://oscar/svn/Baxtech/ViM/Branches/Test3‘ yet:
Error: Some revisions have been merged under it that have not been merged
Error: into the reintegration target; merge them first, then retry.

I googled around for this, and I found some posts saying that this has to do with mergeinfo being created by renames and directory changes in old versions of Tortoise.

I did recently upgrade from the previous version of Tortoise to 1.5.5, however it seems like this problem was pre-1.5.*… And I only changed some comments in one file. I didn’t do any renames or directory structure changes.

Then again, we’ve been working with the trunk for some time (without any branching), so maybe the problem exists in there?

So, if there is a fix for this I would appreciate really appreciate some help. Also, though – is this typical? This was really a very simple test, and sadly right now I’m a little scared to use Subversion for branching.

Subversion: 1.5.4 (via VisualSVN Server)
Tortoise: 1.5.5

We’re also using Visual Studio 2008.

Thanks!

Brian

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. This also happened to me some time ago.

    I can’t remember what I exactly did to trigger this problem, but I can say that I was also using a pre-1.5 release, and then switched to 1.5.0.

    Subversion tracks merges using a per-directory svn:mergeinfo property. This property should only be present on the root path of the working copy (correct me if I’m wrong). When I saw this error, I noticed that pre-1.5 versions created explicit mergeinfo on files inside the working copy, which prevented the stable release from working properly. As you say in your last reply, removing those extra mergeinfo entries fixed the problem for me too.

    My suggestion is to try with a fresh repository with no commits coming from beta versions, and see if this happens again.

    • 0