Databases
StackOverflow2013
Postsdbo
POSubversion Merge Problem: Cannot reintegrate yet
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POSubversion Merge Problem: Cannot reintegrate yet
    text
    copied!<p>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.</p> <p>It failed:</p> <blockquote> <p>Command: Reintegrate merge <a href="https://oscar/svn/Baxtech/ViM/Branches/Test3" rel="nofollow noreferrer">https://oscar/svn/Baxtech/ViM/Branches/Test3</a> into C:\Inntec\VS2008\Baxtech\ViM<br> Error: Cannot reintegrate from '<a href="https://oscar/svn/Baxtech/ViM/Branches/Test3" rel="nofollow noreferrer">https://oscar/svn/Baxtech/ViM/Branches/Test3</a>' yet:<br> Error: Some revisions have been merged under it that have not been merged<br> Error: into the reintegration target; merge them first, then retry. </p> </blockquote> <p>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.</p> <p>I did recently upgrade from the previous version of Tortoise to 1.5.5, however it seems like this problem was pre-1.5.*... <strong>And I only changed some comments in one file. I didn't do any renames or directory structure changes.</strong></p> <p>Then again, we've been working with the trunk for some time (without any branching), so maybe the problem exists in there?</p> <p>So, if there is a fix for this I would appreciate really appreciate some help. Also, though - is this typical? This was really a <em>very</em> simple test, and sadly right now I'm a little scared to use Subversion for branching.</p> <p>Subversion: 1.5.4 (via VisualSVN Server)<br> Tortoise: 1.5.5</p> <p>We're also using Visual Studio 2008.</p> <p>Thanks!</p> <p>Brian</p>
 

Querying!

 
Guidance
An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload