[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: James Sleeman <bitsyboffin_at_gmail.com>
Date: 2006-08-22 11:51:30 CEST

On 8/22/06, Karl Fogel <kfogel@google.com> wrote:
> "James Sleeman" <bitsyboffin@gmail.com> writes:
> > 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.
> >
> > Is there any way of doing this?
> Yes, see http://svnbook.red-bean.com/en/1.1/ch07s05.html .

Thanks Karl, but not what I'm looking for.

I know I can do it manually (wether you use svn_load_dirs or not, it's still
a manual process resolving the moves), but I want to know if I can do it
automatically - the vendor's (subversion) repository has all the ancestry
data, I have access to it, I want
to merge a specific range of changes (REV x to REV y) from that
repository, including ancestry for moved files, into ours.

Effectively, create a patch from REV x to REV y in thier repository
and apply it to REV x' in our repository
to produce REV y' in our repository,preserving ancestry of moved files.

James Sleeman
Received on Tue Aug 22 11:53:07 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.