On Tue, 2009-12-29 at 00:09 +0100, Krzysztof Kosiński wrote:
Regarding the subrevision issue, can someone confirm whether I'm understanding this correctly?
- It is not possible to sensibly assign sequential revision numbers
to all commits that result from a merge. Instead of this, Bazaar leaves the history of the branch that is being merged into alone, and groups all commits from the branch being merged as one "merge commit".
Basically yes. But more completely, the revision numbers (like r2443) are calculated locally in the user facing code. In Bazaar's core they don't really exist.
- Arcadie merged trunk into his local branch, then pushed it to the
trunk. All trunk commits that were made since he created his own branch got grouped into one "merge commit" (8857).
Yes, I would guess that it went something like this.
$ cd trunk $ bzr push error: branches have diverged $ bzr merge ; bzr commit $ bzr push
So the merge parent for the commit in this listing was the old head for everyone else.
--Ted