[merge] robert, aaron, daniel

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
| Well, even with nice merge tools divergence between trees still has a
| cost - Jelmer's branch ABC refactoring overlapped with Robert's working
| tree changes and needed some manual untangling.  I'd like to have us all
| stay close to my tree for day to day use; if there's something you need
| that's not in there yet then hassle me to put it in.

Hmm.  As long as I develop against your mainline, does it matter to you
whether I use some WOLK-style slush pile?  AFAICT, you'd only feel
secondary effects-- I'd have less time for coding because I'd spend more
time merging, but I'd catch bugs earlier because I could dogfood more
effectively.

Aaron

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDfVej0F+nu1YWqI0RAofEAKCGMjY7wHRd0iqtOM67DI6Oh4miqgCfa8qB
Mv/epVTUXNcqnpKv+MmefAY=
=SYcv
-----END PGP SIGNATURE-----