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

merge/patch from vendor repository

From: James Sleeman <bitsyboffin_at_gmail.com>
Date: 2006-08-21 20:59:25 CEST

Hi all. Here's the situation, the vendor uses subversion, we use
subversion, unconnected repositories, we have read to thiers.

We have a vendor branch in ours, which has a certain revision of thier code
in it (an export from thier repository into
ours). We have modifications to that code in our trunk.

Now we want to bring in a new vendor drop, or specifically, we want to
apply to our trunk the changes from thier REV X to thier REV Y.

An svn diff won't do it, because the changes they have made over the last 6
months or so include binaries
(images) which wouldn't be included in a diff, and moving files (that we
want to keep history of so our changes don't get messy) etc.

Is there any way of doing this?

James Sleeman
Received on Mon Aug 21 21:06:29 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.