You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by James Sleeman <bi...@gmail.com> on 2006/08/21 18:59:25 UTC
merge/patch from vendor repository
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
Re: merge/patch from vendor repository
Posted by Karl Fogel <kf...@google.com>.
"James Sleeman" <bi...@gmail.com> writes:
> On 8/22/06, Karl Fogel <kf...@google.com> wrote:
> "James Sleeman" <bi...@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.
Gotcha. I know of no automated solution for that right now. If you
end up scripting one, please post here, of course!
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: merge/patch from vendor repository
Posted by James Sleeman <bi...@gmail.com>.
On 8/22/06, Karl Fogel <kf...@google.com> wrote:
>
> "James Sleeman" <bi...@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
Re: merge/patch from vendor repository
Posted by Karl Fogel <kf...@google.com>.
"James Sleeman" <bi...@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 .
Best,
-Karl Fogel
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org