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

Re: subversion on multisite

From: Sindbad the Seafarer <sindbad.the.seafarer_at_gmx.net>
Date: 2003-08-19 13:08:55 CEST

Concerning Re: subversion on multisite
Erik Hülsmann wrote on 18 Aug 2003, 23:01, at least in part:

> Hi Philippe,
>
> I understand you are a beginner and I know it is hard to be specific
> when just learning the terminology and the field of a new phenomenon,
> but what do you mean?

Erik,

as far as I understand Philippe, he needs to work on two
machines/networks obviously currently not connected to each
other (=two different locations) and thus both having their own
repository (=subversion). In a few months he will be able to connect
those two locations and then wants to "merge" both the two
repositories into one.

I am a bloody beginner, too, but I could imagine two options to do
this:

A)
- create a new branch in repository 1;
- export repository 2 to a folder accessible from the repository 1
machine;
- import this into the new branch created in the first step;
- merge this branch into trunk;
- relocate working copies from repository 2 to repository 1 (or just
checkout new working copies from repos1).

B)
- update one working copy of repository 2;
- relocate this working copy to use repository 1;
- update this working copy from repository 1;
- commit this working copy to repository 1;
- relocate and update all working copies formerly bound to repos 2
or
- checkout fresh working copies from repos1.

I assume B is the easier way, but would loose history of repository
2 and may have weird side effects if there are files of the same
name added to both repositories in the period before merging them
into one.

I am sure the pros can jump in here with better
solutions/suggestions.

One further idea:

- update a working copy of each repository;
- make a diff between these two working copies;
- patch the diff result into the working copy of the repository you
want to continue to use.

I am quite unspecific as I have no experience yet with diff and
patch command.

Jan Hendrik

>
> Did you read the subversion book? I found the book a good resource
> explaining version control in general and more specific the way
> subversion works. The book is at http://svnbook.red-bean.com . There
> also is a FAQ at http://subversion.tigris.org/project_faq.html .
>
> Hope that helps,
>
> Erik.
>
> >Hi,
> >i'm a beginner with suversion.
> >is it possible to work on a same project with 2 subversions on a
> >different network (2 different locations) ? and let's say few month
> >latter, to synchronize the 2 projects on only one subversion. Thank
> >you
> >
> >Philippe
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org For
> additional commands, e-mail: users-help@subversion.tigris.org
>

---------------------------------------
Freedom quote:

     Anything other than free enterprise
     always means a society of compulsion and lower living standards,
     and any form of socialism strictly enforced means dictatorship
     and the total state. That this statement is still widely disputed
     only illustrates the degree to which malignant fantasy can capture
     the imagination of intellectuals.
                -- Lew Rockwell

---------------------------------------
Mailed with Pegasus Mail 3.12c (32bit).
Never heard of it?
Easy to use, full featured - and freely available.
And *no* automatic virus activation and spreading.
Take a look at http://www.pmail.com
Give it a try - and you'll never miss anything else.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 19 13:07:21 2003

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