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

merging across repositories without losing history

From: Greg Wilson <gvwilson_at_cs.utoronto.ca>
Date: 2005-12-08 14:11:53 CET

Hi everyone,

I developed the first version of some course notes in Repository A, which
had the standard layout of '/trunk', '/branches', and '/tags'. A few of
the files in it are '/trunk/Makefile', '/trunk/lec/intro.swc', and
'/trunk/img/bib/wilson-crunching.jpg'.

A few weeks ago, I created a new Repository B, copied source files from A
into B, and started reimplementing and rewriting. (Yes, I should have
just branched inside A, but there were non-technical reasons for creating
a second repo.) As you'd expect, there's also '/trunk/Makefile',
'/trunk/lec/intro.swc', and so on in Repo B, although the structures of
the two repositories aren't exactly the same.

I'd now like to bring all of the content from B back into A. From what I
can see on the web, 'svnadmin dump' in B, followed by 'svnadmin load' in
A, ought to preserve the version history (which isn't essential, but would
be nice). However, I've seen several things that warn me against doing
this if there's any chance of path name collisions --- which there will
be, in spades. On the other hand, Mike Mason says that it's possible to
munge path names in the dumped file so that they don't conflict:

    http://mikemason.ca/2005/10/19/#20051019-SplittingAndMerging

My question is, has anyone done this? And loaded the result into another
repo? And does it work?

Thanks,
Greg

p.s. I'm not a regular reader of this list, so please Cc me on responses.

p.p.s. There's been little change in A since I started work on B, and I've
manually copied all the changes in A that are worth retaining into B.
David James suggested that one option would therefore be to back A down to
the point at which I created B, then replay all the changes made to B on
top of A. Dunno whether there's support for that, or how safe it would
be...?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Dec 8 16:48:44 2005

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