Can I also, please, remind everyone to (a) check the build using both Gtk+ 2 and 3 and (b) run the test-suite "make check" before merging a branch? The PPA will do this automatically for trunk/stable, but there is no experimental-branch build in place at the moment.
Cheers,
AV
On 14 September 2014 18:11, Bryce Harrington <bryce@...961...> wrote:
On Sun, Sep 14, 2014 at 10:02:55AM -0400, Martin Owens wrote:
Hi Tav,
On Sun, 2014-09-14 at 12:55 +0200, Tavmjong Bah wrote:
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.
Yeah, several small merges each implemeting a conceptually distinct change will be easier to manage (for forward porting, testing, and so on) than one large merge.
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)
Well, the plan was that it was an experimental branch for people to try out more radical development ideas without us committing to them longer term. This implies trunk would be split from the current (stable) trunk, and selected changes from experimental forward ported to the new trunk.
We don't *have* to do that, but that was the original intent. In any case, we need to be in consensus on this soon, as it's nearly time to split off the stable branch.
Bryce
Want excitement? Manually upgrade your production database. When you want reliability, choose Perforce Perforce version control. Predictably reliable. http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.cl... _______________________________________________ Inkscape-devel mailing list Inkscape-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/inkscape-devel