merge a huge delta

Hi folks,

I seem to have gotten myself in a pickle.

I had a project being developed on the "trunk" which was just fine. There
was a directory in there that held my unit tests, called "tests"

Then I had to branch the project for some other development. In the branch,
some folks went and created a whole directory structure under "tests", so I
have "tests/foo", "tests/bar", "tests/baz", etc. Then the developers that
were working on the branch went and added several thousand large files to
the subdirectories under "test". The new directories and all the files were
added as part of revisions 290 and 291.

Now I'm trying to merge these huge directories back onto my trunk. If I do
this:

cd working-copy-of-the-trunk/tests
svn merge -r290:291 http://host/path-to-repository/branches/mybranch/tests

The dry run works OK, but when I do it for real, the svn client grows in
memory to 2Gb and is killed by the operating system. I'm on Windows, and
I've tried both the command-line client and TortoiseSVN.

I have tried a few flavors of attempting to do this one-directory-at-a-time,
but I can't seem to get the syntax right.

If I do

cd working-copy-of-the-trunk/tests
svn mkdir foo
svn merge -r290:291
http://host/path-to-repository/branches/mybranch/tests/foo

the system claims to have run successfully, but none of the contents of foo
are placed in my working directory.

Help, please....

-Chris
Received on Tue Aug 30 22:19:43 2005