Apropos of NULL, I've committed a starter for our website search using whoosh and haystack, you can see it here: http://staging.inkscape.org/search/ and it looks dreadful but with tweaking should allow us multi-language searching.
For the continuing saga about bzr hating, continue reading:
On Fri, 2013-07-19 at 19:54 +0200, Johan Engelen wrote:
and I blissfully forgot how to do a merge [*].
1. Merges do not show all the commits: http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/12412 2. Code review shows the entire diff (and optionally separate commits) 3. Good documentation retains enthusiasm, even for git users 4. Launchpad/Bzr is what we use, the docs should explain that workflow and give advice for git and svn users but not special commands.
bzr branch lp:inkscape <do work> bzr commit ... bzr push lp:~user/inkscape/my-awesome-branch bzr lp-submit --fixes=lp:bugnumber
All the merger has to do is: (after review of course)
bzr merge lp:~user/inkscape/my-awesome-branch bzr commit -m "Merge in something awesome" bzr push
There's `bzr send` too, which I think you might like. It sends an email of the diff to someone.
Even the reference card is in inkscape-svg: http://doc.bazaar.canonical.com/bzr.2.4/en/_static/en/bzr-en-quick-reference...
We could include it on the website and show how "what comes around, goes around" :-D
I advocate we continue to use launchpad and bzr and document the workflows applicable to that platform.
Stubbly, Martin Owens
[1] lp-submit requires the launchpad-bzr plugin, installed by default for ubuntu/debian [2] I've worked on bzr user interfaces, my research on GUIs showed pretty awful design for distributed workflows. I have some videos here for how I saw it working: http://www.ground-control.org/videos.html