On Sun, Sep 14, 2014 at 6:55 AM, Tavmjong Bah <tavmjong@...8...> wrote:

The merge of the latest features from Liam into the Experimental branch
raises the question of best practices for merging. In particular, I am
not sure that merging multiple features at one time is a good idea.
Other projects seem to divide commits into the smallest possible pieces.
I think that this is good practice as it better documents what is being
committed, allows for better reviews, and makes it easier to cherry-pick
from one branch to another.

In particular, the commit message:

"Merge in ponyscape features by Theo and worked on my LiamW"

doesn't give any information about what are the purpose of the changes.
It takes reading the code and/or searching the web to find this
information.

If you update your experimental branch and ran 'bzr log' you'd see this:

liam$ bzr log -r13545
------------------------------------------------------------
revno: 13545 [merge]
committer: Martin Owens <doctormo@...400...>
branch nick: experimental
timestamp: Sun 2014-09-14 02:27:21 -0400
message:
  Merge in ponyscape features by Theo and worked on my LiamW
------------------------------------------------------------
Use --include-merged or -n0 to see merged revisions.


If I ran 'bzr log -r13545 -n0' I can see all merged revisions.

Or, if you'd prefer the web interface, you can see older (merged) revisions here:
http://bazaar.launchpad.net/~inkscape.dev/inkscape/experimental/changes/13090.1.108