Comment 4 for bug 605059

Yes, bzr merge is the way to do it; if by "incremental merge" you mean keep all revisions, that's exactly what will happen -- just like for the merges we're doing when we merge topic branches (with multiple commits) into gcc-linaro with bzr merge.

I think we need to be careful of the points at which we merge. We could merge continuously, at random points, that's probably ok but makes life complex for downstreams like Ubuntu which will then apply our diff on top on a released tarball, possibly after applying an SVN update patch.

e.g. for Ubuntu it's either:
- we merge random revisions, Ubuntu takes the diff between latest FSF release we have merged and our latest release; things go well if Ubuntu is basing on the same FSF release, but the SVN diff can't be combined with ours; if Ubuntu uses newer or older FSF base, things might not apply
- we merge at precise FSF release points; it's as above, except SVN diff is likely to be applicable

Another way to avoid the issue would be for the Ubuntu update process to be a bit more complex, taking a SVN checkout + FSF tarball + Linaro tarball as inputs instead of creating the SVN diff and the Linaro diff independently.

So I'd rather have us follow FSF release points for now and discuss how to handle that with Ubuntu at the next occasion.

I think the way to merge all revisions up to 4.4.5 is, from a gcc-linaro 4.4 checkout or a topic branch based on it:
    bzr merge -r tag:gcc_4_4_5_release lp:gcc/4.4

Cheers,