> -----Original Message-----
> From: Ben Collins-Sussman [mailto:sussman@collab.net]
> Sent: 13. juni 2004 23:44
> To: Casper Hornstrup
> Cc: users@subversion.tigris.org
> Subject: Re: Synchronizing two branches
>
> Casper Hornstrup wrote:
>
> > Say I have two branches http://server/repos/branchA and
> > http://server/repos/branchB.
> >
> > Head of branchB has some changes that is not on head of
> branchA, and I
> > would like to merge these changes to branchA so that head
> of branchA
> > has the same content as branchB.
> > If I cannot assume anything about the history of branchB,
> what are the
> > svn commands to do that?
>
> Please chapter 4 of the Subversion book. At least make an
> effort, and then come ask specific questions. :-)
Okay, from reading chapter 4, I believe what I want is:
svn merge --ignore-ancestry http://server/repos/branchA
http://server/repos/branchB
With my approx. 70MB, 6.800 file, and 1.000 directory code
base I get very poor performance. Now it has run over 2
hours and it has not gotten very far. There is
about a month worth of changes between the two branches.
An example:
U lib\rtl\makefile
A lib\rtl\encode.c
U lib\crtdll\stdlib\wcstomb.c
D lib\crtdll\stdio\vfprintf.c
D lib\crtdll\stdio\vfwprint.c
D lib\crtdll\libc\atexit.h
D lib\crtdll\libc\file.h
U lib\crtdll\makefile
U lib\userenv\setup.c
U lib\userenv\environment.c
From vfwprint.c is displayed to atexit.h is displayed,
11 minutes and 36 seconds pass.
Then file.h and makefile are displayed within 30 seconds.
The client machine is a 2.4GHz P4 and the repository machine
is a Dual 3GHz Xeon. Both has Windows Server 2003 OS. Using
performance monitor I can see the following:
Disk usage on the client machine is not much (27KB/s on average)
CPU usage on the client machine is not much (about 2-8%)
Disk usage on the repository machine is not much (15KB/s on average)
CPU usage on the repository machine is not much (about 0-10%)
The slowest link between the two machines is 2Mbit/512KB ADSL.
I use Subversion 1.0.4 over apache2 with SSL for my testing.
What could cause this?
Casper
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jun 26 15:35:22 2004