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

Re: merging suddenly doesn't work

From: Andreas Pakulat <apaku_at_gmx.de>
Date: 2006-05-12 15:23:56 CEST

On 12.05.06 14:36:17, Ryan Schmidt wrote:
> On May 11, 2006, at 23:42, Andreas Pakulat wrote:
> >So do you have a hint on how I could merge using the python script
> >mentioned in my original post? I mean such that the merged project ends
> >up in <myrepository>/project/trunk and not in
> ><myrepository>/project/foo?
> >
> >Or am I better off using diff and patch?
> The svn_load_dirs.pl Perl script is designed to handle this scenario. I believe
> it should be described in the Vendor Branches section of the book.

Thanks for this extensive explanation, it surely cleared up things.
However: I don't want to keep track of "old" revisions of aqbanking and
thus svn_load_dirs.pl is not really what I want.

What I did now is something similar. Imported aqbanking/trunk into my
own repository and everytime I need to sync it with upstream I just
create a diff between the apropriate revisions like

svn diff -r1005:10013 https://.... >r1005_r10013.diff

apply it to a working copy of my own aqbanking and then I can merge the
differences to my real project (based on aqbanking source).


You will gain money by a fattening action.
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri May 12 15:25:05 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.