[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-11 18:31:45 CEST

I have an idea that might work but I am not sure. I've created this new
repository on March 8. So if I create a diff of my old repository from
March 8 to today than apply it to my new repository, would that work?

ufuk kocolu wrote:
>
> 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?
>
>
>
> Chris.Fouts@qimonda.com 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.
>>
>>
>>> -----Original Message-----
>>> From: ufuk kocolu [mailto:ufuk@pilli.com] Sent: Wednesday, April 11,
>>> 2007 7:40 AM
>>> To: users@subversion.tigris.org
>>> Subject: merge two different repositories
>>>
>>>
>>> I had a repository of a running application, a web site, when I
>>> needed to develop a new module (that is deeply integrated in this
>>> application and certainly would break and harm the already running
>>> web site) I created a new repository. But I had to make some
>>> updates,fix some bugs in this old version (running source) and now I
>>> have merge these two. I imagine that will be a very hard job and a
>>> major pain.
>>>
>>> Which way should I choose to do this job?
>>>
>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>>> For additional commands, e-mail: users-help@subversion.tigris.org
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: users-help@subversion.tigris.org
>>
>>
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Apr 11 18:32:25 2007

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