Merging between trunk and a vendor branch

[kkrikor <kr...@gmail.com>]

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


First i did the following
1. svn import /home/vendor-project/ http://url/repo/project/vendor/x/current
-m 'importing vendor drop'
2. svn copy http://url/repo/project/vendor/x/current
http://url/repo/project/vendor/x/1 -m 'tagging1'

Now i need to merge this code to my trunk how do i do that ?

I tried the following
Code:

In my working directory which has the trunk
svn merge http://url/repo/project/trunk
http://url/repo/project/vendor/x/current .

But that is doing deletes and then adds for the same files.

Any suggestions ???

-- 
View this message in context: http://www.nabble.com/Merging-between-trunk-and-a-vendor-branch-tf2776511.html#a7745765
Sent from the Subversion Users mailing list archive at Nabble.com.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Merging between trunk and a vendor branch

[eg <eg...@gmail.com>]

kkrikor wrote:
> Hey guys I have the following scenario
> 
...
> Any suggestions ???
> 

See:

http://svnbook.red-bean.com/nightly/en/svn.advanced.vendorbr.html

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

RE: Merging between trunk and a vendor branch

[Ch...@qimonda.com]

 

>-----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