Hi Uli,
> > Things have checked out and now we want to upgrade. I want to swap my
> > trunk and my branch.
>
> This sounds strange now. Normally, you would merge the branch back into the
> trunk. Also, what about the changes made to the trunk since you made the
> branch? Do you want to discard them?
No, I don't want to discard them. I was going to merge the changes
from the trunk to the branch, then swap. After thinking about it a
bit, I suppose it would make more sense to just merge the branch
into the trunk. One problem though...
> > If between now and our release we find some VS2010 show stopper,
> > I should be able to just merge all the changes from our VS2010 trunk
> > into the branch, then build the branch with our old build tools.
>
> Even if you later find the need to discard the VS2010 integration, you can
> still create a branch from the version before you merged it. You don't have
> to create it now.
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.
Cory
Received on 2010-07-07 17:03:30 CEST