On Dec 1, 2007, at 03:53, Ewgenij Sokolovski wrote:
> Hello, guys. I'm not so experienced with subversion, so I got a
> little bit confused with the issue I want to discuss here. I had a
> svn-repository on server A. Then I decided to migrate it to server
> B. Fine :) I made a dump and sent it to B's admins expecting them
> to load it on server B. But the admins couldn't do that for some
> reason I don't know. So I just checked in the actual version of my
> repository on server B, as if there were no history on A at all.
> After a week and several revisions on B, the admins were able to
> load my old dump. So now I got two repositories:
>
> 1) The repository containing the contents of the old dump
> 2) The repository with my most new project revisions
>
> Now, how could I merge these two things together? Is it possible at
> all?
That's a mess.
You could try this:
a) Check out a working copy of (1). This is the repository you will
use from now on.
b) Check out a working copy of (2).
c) Update the working copy of (2) to the revision of the first change
that you made that is not in (1). So, for example, if your first
change occurred in revision 2, then "svn co -r 2 url://to/that/repo"
d) Manually (using your OS facilities, not svn commands) copy all
files changed in that revision over to the working copy of (1). (In
the working copy of (2), "svn diff --summarize -c 2" should tell
you.) If you added or moved or removed files, issue the appropriate
svn add, svn mv or svn rm commands again.
e) Commit working copy (1).
f) Go back to (c) and update it to the revision of your next change.
Do this for all remaining revisions in (2).
g) Finally, remove repository (2) and all its working copies and use
only repository (1) from now on.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Dec 1 20:31:06 2007