Re: swapping the trunk and a branch

On Wednesday 07 July 2010, Cory Riddell wrote:
> My problem is that merges have been very problematic for me. They
> consistently fail due to running out of memory. I downloaded the
> 64-bit client tools from SlikSVN and they will work if it is the
> only thing running. My machine is a 4 core machine with 4 GB of
> RAM and a 6 GB swap file (64-bit Windows 7). The merge takes a
> long time to complete and uses up almost all of the physical +
> virtual space.
>
> My svn client is version 1.6.12 (64-bit) and the server is 1.6.6
> (32-bit). The project has something like 2000 files.

I'm using TortoiseSVN here, on a dual-core machine with 1GiB of RAM, and I can
perform merges on a similar-sized project without problems. It's not
lightning fast, but I can still use other programs while the merge runs. The
repository is served via svnserve in the LAN and hosted on a Debian/Linux
machine.

Of course, the complexity (i.e. memory and time) for a merge operation
increases with the number of revisions and the number of files, but a mere VS
upgrade should only touch projectfiles and maybe a few sourcefiles, all of
which are easy to merge and not too large.

That said, what we have here is sourcecode that compiles in parallel on VC6,
VC7.1, VC8 and eVC4. All you have to take care of is that the directories for
output and intermediate files (OutDir and IntDir) have an according tag so
that they don't interfere with each other. That's completely off-topic for
this list though....

Cheers!

Uli

-- 
ML: http://subversion.tigris.org/mailing-list-guidelines.html
FAQ: http://subversion.tigris.org/faq.html
Docs: http://svnbook.red-bean.com/
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************