GCC SVN vs. BZR/LP
ams at codesourcery.com
Wed Nov 17 14:52:08 UTC 2010
On 17/11/10 09:57, Andrew Stubbs wrote:
> On 17/11/10 03:35, Michael Hope wrote:
>> There's two open questions:
>> 1. How easy is it to frequently merge in SVN? It used to be terrible
>> as you had to manually track the merges. These days can you do a 'svn
>> merge trunk' and have it just work?
> Subversion 1.5 supports merging that appears to be equivalent to bzr
> merging (within SVN's somewhat different concept of branching), and
> should do the job nicely.
Oh, I should say, neither SVN merge, nor BZR merge will work for merging
*to* trunk. (Both will be suitable for merging *from* trunk.)
Doing a merge like that will a) flatten all the patches into one monster
patch, and b) include all the other bits and pieces you don't want on
the main trunk (release version numbers, etc).
Obviously, there are ways to work around these issues, but I'm just
saying that a straight merge probably isn't what you want.
More information about the linaro-toolchain