http://www.burtonini.com/blog//computers/svn-vendor-2005-05-04-13-55?showcomments=yes
holds a more simpler mechanism, i would like to think that i can trust
the code that is in the open_source repository, hence i see no need to
maintain a copy of their svn repository
ps the svn merge does give problems if there is a change in the
directory structure of the two svn's
Kalin KOZHUHAROV wrote:
> Plese do NOT top post, as it breaks the logical flow of the MSGs...
>
>
> Rupinder Singh Mazara wrote:
>
>>
>> could point me where i can get information that allows me to do the
>> following
>> a) we start a customization of open_source project from version 5548
>> b) the open_source project has moved to 5570
>> c) we in the mean while have applied some chages to the version of 5548
>
> In chapter 4 of the book
> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html or any
> other resource on branching (and possibly tagging).
>
> My idea is that it may be valuable to keep all the comments and other
> history for the project. For this you need to clone the repository. A
> quick search didn't reveal any ready-made scripts for that (that use
> only svn, NOT svnadmin)...
> Shouldn't be taht hard to even write that in bash. The idea is to
> protect from the possibility of the other repository gone, and to have
> it locally, so you can have quicker access.
> So suppose you have a copy of the original repository (you can skip
> that step for now). Say the trunk it is at $URL_vend/trunk.
> You create your repository at $URL
>
> __START__
> cd work
> svn co $URL
> svn mkdir trunk branches tags
> cd trunk
> svn export -r 5548 $URL_vend/trunk .
> svn cp trunk tags/vnd-5548
> svn commit -m "Initial import for $URL_vnd/trunk@5548"
>
> __ITERATE__
> _apply_some_changes_to_trunk_
> svn commit -m "bla-bla"
> svn merge $URL_vend/trunk@5548 $URL_vend/trunk@5570 trunk/
> _resolve_conflict_
> svn commit -m "Sync to $URL_vend/trunk@5570"
> __END__
>
> The down part is that you have to "remember" (use svn log) which was
> the last revision you synced to.
>
>> how to go about doing a merge that brings our baseline up from 5548 -
>> 5570 while maintaining the customization that we have done ?
>
> I think the above should do it.
> And if you have an exact clone of the vendor's repository (in your
> vendor repository :-) you can roll-back changes if needed very easy.
>
> Initially, I thought that using svn:externals could make that easier,
> but after some thinking, might be wrong.
>
> Kalin.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 23 20:25:09 2005