On May 12, 2006, at 10:13 AM, Andreas Pakulat wrote:
> On 12.05.06 16:38:43, Ryan Schmidt wrote:
>> On May 12, 2006, at 15:23, 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).
>>
>> AFAIK, that procedure will not handle directory additions or
>> deletions or
>> changes in properties, and I'm not sure what it'll do with file
>> additions or
>> deletions. It will only properly handle changes in the contents of
>> existing
>> files. So just be aware of that, and maybe play around with a few
>> scenarios and
>> try it out and see whether it handles it well enough for your needs.
>
> I've got another question regarding svn_load_dirs: Can I somehow use
> that program to import the svn-checkout of upstream? I can of course
> strip the svn-dirs, however then I won't get the svn properties
> either.
> So is there a way to preserve the properties when using svn_load_dirs,
> or is there maybe another way to keep track of upstream in my own
> repository?
svn_load_dirs.pl will not track the properties for you.
BTW, I believe that the merge failed in this case because it doesn't
support adding files that are copies of other files in the remote
repository.
Regards,
Blair
--
Blair Zajac, Ph.D.
<blair@orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun May 14 03:10:22 2006