Newbie Question 2: Merging across repositories

I have another newbie issue which I cannot find an answer for on the net:

(1) The application we develop is maintained in one repository. (2)
Each installation of the application for clients is maintained in a
separate repository. Repository 2 has a copy of the application at its
most stable version when the client install was done, including any
additional files required for that particular client install. When we
upgrade a client's install, we need to grab the most resent and stable
version from repository 1 and merge them into repository 2.

The way we accomplished this with CVS is as follows:

1) Grab a copy of the most resent stable version:
    cvs co -rRELEASE_3_3_0_BUILD_1 ignitionweb_base

2) import application changes into client repository:
    cd ignitionweb_base
    cvs import -m "Import of ignitionweb_base RELEASE_3_3_0_BUILD_1."
3macs htc IW_RELEASE_3_3_0_BUILD_1

3) Merge the changes:
    cd ..
    cvs checkout -kk -jhtc:yesterday -jhtc 3macs

4) Fix conficts and commit:
    cvs ci -m "Merged with ignitionweb_base RELEASE_3_3_0_BUILD_1,
resolved conflicts."

With SVN I tried a similar approach:

1) Grab a copy of the most resent stable version:
    svn co file:///htc/svn/ignitionweb_base/tags/RELEASE_3_3_2_BUILD_3
ignitionweb_base

2) import application changes into client repository:
    svn import file:///htc/svn/3macs/branch/test

3) Grab a copy of client repository trunk
    svn co file:///htc/svn/3macs/trunk

4) Merge changes:
    svn merge file:///htc/svn/3macs/branch/test
file:///htc/svn/3macs/trunk 3macs

This results in the following output:

....
D 3macs/iw3/etc/webdev_dirs
D 3macs/iw3/etc
D 3macs/iw3
svn: Revision 233 doesn't match existing revision 232 in '3macs/iw3'

All the files common between repository 1 and the client repository get
marked for deletion? How should I be approaching this problem?

Thanks in advance,

Michael

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 27 18:54:51 2005