subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@elego.de>
Subject Re: merging trunk to branch merges the whole trunk history
Date Wed, 03 Feb 2010 09:33:00 GMT
On Tue, Feb 02, 2010 at 07:30:27PM -0800, esatel wrote:
> Hi,
> I have an svn repository created by converting an old cvs repository
> using SVN 1.5.1.
> 
> If I do the following:
> 1. Create a branch  around trunk revision 1598
> 2. Work a bit further on the trunk and commit (I don't think this is
> necessary, but the repository is too busy to exclude)
> 3. Someone else works and commits on the branch (I don't think this
> is necessary)
> 4. I abandon the trunk and check out the branch fresh
> 5. cd into the branch
> 6. svn merge URL_TO_TRUNK
> 
> I get conflicts on seemingly every file that got altered at least in
> the trunk. Every file in the trunk is involved in the merge and if
> it isn't a conflict it is marked "A" for added. One of the progress
> messages says this:
> --- Merging r2 through 1606 into .
> 

Sounds like your cvs->svn conversion did not create mergeinfo.

You will have to add the missing mergeinfo by doing a record-only merge
from trunk to the branch:

  cd branch-working-copy
  svn merge --record-only -r0:X REPOS_URL/trunk

The resulting mergeinfo, once committed, tells svn that the branch
already contains any changes which affected trunk between revisions
zero and X. After that, the branch should be able to soak up changes
from trunk normally.

The same applies to all your other branches.

Also, please, please, please, for you own sake, before you do anything
else to your Subversion repository, update server and client to 1.5.7
or to 1.6.9. Many important bug fixes have been made since 1.5.1,
including fixes to merge tracking. If you run into any of the fixed
issues and ask for help here, the response will likely just be "please
upgrade", so you might as well do it now.

Stefan

Mime
View raw message