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

RE: Merging between trunk and a vendor branch

From: <Chris.Fouts_at_qimonda.com>
Date: 2006-12-07 20:34:52 CET

 

>-----Original Message-----
>From: kkrikor [mailto:krikor.krumlian@gmail.com]
>Sent: Thursday, December 07, 2006 2:20 PM
>To: users@subversion.tigris.org
>Subject: Merging between trunk and a vendor branch
>
>
>Hey guys I have the following scenario
>
>Code:
>
>1. in /trunk i have the code for my project 2. A vendor took
>this code in other words they have an export of the code and
>did some work on it 3. they sent me the new project.
>4. Now i need to integrate their changes into my trunk
>
>

Try the following.
- Create a branch off your trunk
- Manually copy (via script of course) your vendor files onto the
  branch
- Merge your branch to trunk.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Dec 7 20:35:56 2006

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