[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merging trunk to branch merges the whole trunk history

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 17 Feb 2010 17:04:17 +0100

On Wed, Feb 17, 2010 at 06:24:35AM -0800, Eli S wrote:
> Once we upgrade, can I recover
> using the same ideas? Do I have to mark the trunk in any way?

I don't think you need to do anything apart from upgrading the server.
Subversion should be able to figure this out automatically.
It just needs to look at the revision which the branch was created in,
which is also recorded by 1.4 servers.
I don't think revisions prior to that would be considered eligible
for merging into the branch.

But even if it doesn't work out of the box, all you need to do is carry
out a --record-only merge that creates the necessary mergeinfo on the branch.
Merge all revisions up to the one in which the branch was created
from the trunk into the branch, passing the --record-only option to
the svn merge command. This should create mergeinfo only, and not merge
any actual changes. Once the mergeinfo is committed, syncing the branch
with trunk should work fine.

Received on 2010-02-17 17:04:59 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.