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

Re: Can I convince svn 1.5 that a random directory is really a branch off of trunk?

From: Peter Kahn <citizenkahn_at_gmail.com>
Date: Thu, 23 Oct 2008 11:34:30 -0400

Ah, so the answer is appears to be "yes": manipulate the mergeinfo for trunk
and the "branch" such that at branch origin is its recorded as synchronized
with trunk.

r1000 branch created via add by converter
r1001-HEAD both branch and trunk modified by various modifications

modify trunk's mergeinfo with /branch/foo:1-1000
modify branch's mergeinfo with trunk:1-1000

Now branch and trunk should assume that they are insync as of branch
creation. Now, merges between them should work properly.

I came up with this plan after reading some of this doc:


*Does this make sense?*

On Wed, Oct 22, 2008 at 3:11 PM, Peter Kahn <citizenkahn_at_gmail.com> wrote:

> I recently used the Polarion converter to import my MKS repository to svn.
> I had to make some changes to support a cutoff point based on date for the
> export out of MKS. I confused the importer and now my svn repository has
> branches the are really adds of 1000s of files instead of a proper branch.
> Is there a way for me to tell SVN that "project/branch/1.0_integration"
> came from trunk @ revision 450?
> Right now, when I try to merge between branches merge the svn application
> takes 100% cpu and gobbles up all of my ram before terminating with an
> out-of-memory error.
> I can dump my repository and rebuild it with a skeleton of tags branching
> where appropriate, but I'll loose the who-did-what history and I'd really
> like to keep that.
> So, anyone have any ideas? Or can someone point me at the right place for
> me to RTFM?
> Thanks.
> --
> Peter Kahn
> citizenkahn_at_gmail.com
> pkahnpie1_at_AIM
> http://citizenkahn.myplaxo.com
> Awareness - Intention - Action

Peter Kahn
Awareness - Intention - Action
Received on 2008-10-23 17:34:59 CEST

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.