Hi Tav,
On Sun, 2014-09-14 at 12:55 +0200, Tavmjong Bah 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.
I agree and it's one of the items I brought up with Liam. So this is my logic: This branch is going to be such a pita to wrangle into multiple merges and has been kicking around for some time. We have the opportunity to be a little more risky with the experimental branch, so after a code review I decided it was worth merging.
"Merge in ponyscape features by Theo and worked on my LiamW"
I was really hoping the tree commit messages would be available. I guess I should re-document it. Sorry branch!
I think these should have been committed separately with a line or two explaining what each does. Also, each LPE should be a separate commit.
Agreed.
As an additional question: is the experimental branch going to become 0.92? I think there have been too many changes to the experimental branch to try to merge it with trunk.
That was always my understanding. Experimental will become trunk later. I always assumed that fixes were making their way into both branches. (although looking at the commit counts, this is a little worrying)
Sorry again for any ruffling. Hopefully we'll be able to digest this large patch (or pull it out if needed, but bzr manager will have to do that)
Best Regards, Martin Owens