[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Newbie Question 2: Merging across repositories

From: Joshua Varner <jlvarner_at_gmail.com>
Date: 2005-09-28 18:03:19 CEST

On 9/28/05, Michael Caplan <michael.caplan@htc.ca> wrote:
> Hi Josh,
>
> Thanks for the reply. I haven't tried your recommended
> --ignore-ancestry suggestion. I will give that a spin. For now, I
> found the following approach to work:
>
>
> 1) Determine what the release branch or tag you will be upgrading to and
> export a copy:
> svn export file:///htc/svn/ignitionweb_base/tags/RELEASE_3_3_2_BUILD_3
> ignitionweb_base
>
> 2) Now to import it into the client repository:
> svn_load_dirs file:///htc/svn/3macs/ -t branches/release_3_3_2_build_3
> branches/htc ignitionweb_base/
>
> 3) You know need to have a current up-to-date client svn sandbox:
> svn co file:///htc/svn/3macs/trunk 3macs
>
> 4) We now will merge the differences between branches/htc before and
> after the merge of release_3_3_2_build_3 into the current trunk. Before
> doing so, you need the revision number of branches/htc before the merge.
>
> cd 3macs
> svn merge file:///htc/svn/3macs/branches/htc_at_216
> file:///htc/svn/3macs/branches/htc
>
That should work since the files in the branch are all related. It looks like
the recommended practice with vendor branches, you might take
a look at that if you haven't already.

http://svnbook.red-bean.com/en/1.1/ch07s05.html

Josh

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 28 18:07:14 2005

This is an archived mail posted to the Subversion Users mailing list.