tags:

views:

50

answers:

1
Q: 

In TortoiseSVN, how do I re-integrate a Branch if our server is only running SVN v1.4 and re-integration is not supported?

I have a SVN branch that I branched off from the Trunk several revisions ago. I have merged the branch with changes from the trunk to keep it in sync. Now I would like to finally integrate my Branch with the Trunk. What is the best way to go about this? I cannot use the re-integrate option because our SVN server version is only 1.4.

A: 

Messy - but export the code on your branch to a main, check the chances and commit?

emeraldjava  2010-03-02 13:22:36

related questions

How do I move a file (or folder) from one folder to another in TortoiseSVN?
How do I use a start commit hook in TortoiseSVN to setup a custom log entry?
Prevent file casing problems in Subversion
Find checkout history for SVN working folder
Can I turn off automatic merging in Subversion?
How to keep Stored Procedures and other scripts in SVN/Other repository?
Can I have TortoiseSVN auto-add files?
Better Merge Tool for Subversion
Best tools for code reviews
How do you move a file in SVN?
How do I change the default author for accessing a local SVN repository?
How do I download code using SVN/Tortoise from Google Code?
How to Turn Off Sounds in Turtoise SVN
Is there anything like TortoiseCVS and TortoiseSVN for git?
TortoiseSVN side-by-side configuration is incorrect
Best way to deploy subversion (SVN) in a multisite windows environment
TortoiseSVN & Putty very slow
Can I make Subversion + TortoiseSVN case-insensitive for Windows?
VisualSVN undelete with TortoiseSVN
Resharper and TortoiseSVN
Shelve in TortoiseSVN?
Making a production build of a PHP project with Subversion
Best SVN Client Ignore Pattern for VB.NET Solutions?
Integrating Fogbugz with TortoiseSVN with no URL/Subversion backend
Good branch/merge tutorials for Tortoise SVN?