[MERGE] Documentation for integration with bzr

[Aaron Bentley]

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

Martin Albisetti wrote:
> On Sat, Apr 5, 2008 at 1:33 PM, Aaron Bentley <aaron at aaronbentley.com> wrote:
>>  > Personally, I find incomplete docs much better than nothing at all,
>>
>>  Me too.  But we already have much better than nothing at all.  We have
>>  the wiki.
>>
>>  Moving the document to the source tree makes it harder to make changes.
>>   It's a chilling effect.  I think that moving it to the source tree at
>>  this stage will prevent us from getting a bunch of positive
>>  contributions from wiki users.
> 
> How about leaving it in the wiki and trying to keep the valuable
> changes more or less in sync?

"More or less in sync" has been a bit of a pain with other documents.

I suggest
1. Copy your ReST version into the wiki (Moin supports ReST)
2. Periodically copy the wiki version into the source tree verbatim.

>>  There should be a single place (preferably earlier on)
>>  that explains how to compare trees, and later sections should refer to it.
> 
> Would you mind editing that bit (on the wiki even, I'll resend a patch
> with the change) so the doc is clearer?

Okay.

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

iD8DBQFH96zK0F+nu1YWqI0RAkFUAJ9FAHrTv55RNSGZ0Y52S0ZbRZvNHQCcCdw9
+yuKwhhVe0T6F/pel0Udmow=
=IYrh
-----END PGP SIGNATURE-----