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

Re: merge/patch from vendor repository

From: Karl Fogel <kfogel_at_google.com>
Date: 2006-08-22 08:00:00 CEST

"James Sleeman" <bitsyboffin@gmail.com> writes:
> 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?

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

-Karl Fogel

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 22 08:01:19 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.