Comment 6 for bug 605059

The problem is that Ubuntu has one base AND an update to latest SVN patch; I guess we have to disable this when the Linaro diff is to be applied.

Multiple commits: ah I see why you're asking. It's not a collapsed history, the merge commit is a meta-commit, encapsulating the individual commits. It's only the bzr log defaults which give you this sense of collapsedness :-)

"bzr merge" and creating a merge commit is the right way to do it, we can revert individual commits we merged if we need to.