Merge question

We use Subversion (version 1.5.1 (r32289)), but our baseline
maintainer (in another state) uses a different version control
system.

In January, they gave us a disk with baseline version 10.

In April, we gave them a disk with
revision 2591 = baseline version 10 + our changes.

Both sides develop in parallel.

In September, they gave us a disk with baseline version 11.

We want to merge our changes, revision 3020, with baseline
version 11. The first thing we did was put version 11 under
Subversion at URL/tags/11v1. Now we had two choices:

1. Take our changes from 2591 to 3020 and merge that
   into URL/tags/11v1.

2. Take the changes from 2591 to 11v1 and merge into revision 3020.

We tried both approaches, and they both failed in the same manner.
Does anyone have a suggestion about what to try next?
About which approach is better?

What we tried (Linux, RedHat 5, csh):

1. Take our changes from 2591 to 3020 and merge that
   into URL/tags/11v1:

cd ~
rm -rf src
svn co URL/tags/11v1/src
cd src
svn merge --ignore-ancestry URL/trunk/src_at_2591 URL/trunk/src_at_3020 .

svn: Cannot replace a directory from within

2. Take the changes from 2591 to 11v1 and merge into revision 3020:

cd ~
rm -rf src
svn co URL/trunk/src
cd src
svn merge --ignore-ancestry URL/trunk/src_at_2591 URL/tags/11v1_2/src .

svn: Cannot replace a directory from within

Thank you for all your help!

Sincerely,

Jim Ward
Received on 2008-09-26 14:14:49 CEST