Hi ,
So rather than manually backporting a patch from upstream "trunk" I decided to try using bzr for this yesterday. Even though this was a slow process and thanks to some help from Michael on IRC last night I think I got it right finally. However I can't get bzr visualize to show me the revision history correctly with the merge from the upstream repository.
So what I did was to do the following
bzr branch 4.5 new-branch cd new-branch bzr merge -c XXX lp:gcc where XXX is the bzr revision number of the svn commit that I'm tracking upstream.
gcc/Changelog merge fails - there is a conflict. Expected because you are merging trunk's gcc/Changelog into a version of the Changelog file in our tree
Thus I reverted changes that were brought in by copying in a backup of gcc/Changelog that I had made before the merge
bzr resolved gcc/Changelog
edit Changelog.linaro Add changelog entry
bzr commit bzr push lp:gcc private repository Create merge request upstream.
Does this look sensible to people or do folks follow other recipes?
cheers Ramana