Maybe I thought too quick about it. I think I'll work in my own branch, but perhaps every now and then push things that work to trunk?
Last year I had LPE in a branch and it was easy to keep it up to date with trunk; which I did very regularly.
SVN makes frequent integration painful
It would be nice to be able to do it with one push of the button, but I had no particular hard time last year (with Tortoise, it's maybe pushing 5 buttons).
I think Peter is right about me better not working in trunk. The 'bad bugs' argument to me actually sounds in favor of using a branch, because I like to keep trunk useable and only a slight bit more buggy than release (or maybe even less buggy).
Thanks,
Johan
-----Original Message----- From: MenTaLguY [mailto:mental@...3...] Sent: dinsdag 22 april 2008 19:32 To: Engelen, J.B.C. (Johan); bryce@...1798... Cc: inkscape-devel@lists.sourceforge.net; Peter.Moulder@...38... Subject: Re: [Inkscape-devel] GSOC branches
I really, really, really strongly believe we shouldn't do branches unless we use a dscm like bzr to do it. SVN makes frequent integration painful, but frequent integration is the only way to keep things from diverging horribly in the long run.
Via launchpad, we do already have a bzr mirror which tracks trunk that people can clone from, so there is no technical obstacle to using bzr at this point. The main missing piece is that I'd like to see a way to push commits back up to SVN from bzr, like you can with git. (In the worst case you can simply extract a changeset as a patch and do things that way, however.)
-mental