On Tue, 29 Dec 2009 00:09:29 +0100 Krzysztof Kosiński <tweenk.pl@...400...> 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". 2. 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).
Is this correct?
Mostly. The commits that became sub-commits of Arcadie's commit weren't merged together into one mass change, they still exist as separate commits attributed to their original authors with only the changes made by those authors. But you need to look at the sub-commits or sub-revisions attached to Arcadie's commit to see them. Launchpad doesn't show them, there are already three duplicate bugs posted against launchpad for this, but other bzr utilities do, for example `bzr log --level=0 --verbose --show-ids` from the command line.
I chatted about this on #bzr for some time today, and their first response was so what, that's how it's supposed to work, followed by a second response explaining how to avoid having that happen again. For some reason not all my posts to this list show up, or at least I don't see them all. For example this post:
http://article.gmane.org/gmane.comp.graphics.inkscape.devel/32676
I haven't seen arrive on the list myself, it describes how to enforce merging of local branches into the trunk, rather than the other way around.
Anyway, there is a workflow which ensures sensible revision numbers, and that workflow can be enforced (see the post or maybe you saw the email on this list already).
Cheers -Terry
Regards, Krzysztof
This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel