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

Re: merge two different repositories

From: ufuk kocolu <ufuk_at_pilli.com>
Date: 2007-04-12 13:41:28 CEST

I created a new empty repository and loaded the first dump without any
problems.

But when I try to load second dump file

svnadmin load new-repository < second.dump.file

I get an error like

adding-path: svn admin file already exists: new-repository/db

So is it impossible to merge two repositories with same paths?

Ryan Schmidt wrote:
>
> On Apr 11, 2007, at 11:09, ufuk kocolu wrote:
>
>>> This where a branch would have been a better choice,
>>> if by "merging" you mean the actions resulting in an
>>> "svn merge", which would do exactly what you intended
>>> to do.
>>>
>>> If by "merging" you mean just "combining", then the
>>> svnadmin dump/create/load approach as suggested by
>>> someone would work for you.
>>
>> I'm guessing I made a big mistake at the beginning. I already created
>> two repositories -a few weeks ago- and I have many local changes in
>> both of them. I was hoping to
>> be able merge most current changes in both of the files and then fix
>> the errors with minimal effort. But as you mentioned, branches might
>> be what I should have used.
>>
>> As I said, there are many changes in both repositories, any way to
>> turn this into a branch and save myself from future problems?
>
> You can dump and load so that everything is in one repository, as
> discussed earlier in the thread. Then you may be able to merge. You
> may need to use the --ignore-ancestry option.
>
>
> --
> To reply to the mailing list, please use your mailer's Reply To All
> function
>
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 12 13:42:00 2007

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