[merge] reformat news into more standard ReST (Re: [rfc] news layout tweak)

John Arbash Meinel john at arbash-meinel.com
Thu Mar 19 02:27:27 GMT 2009


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

Ian Clatworthy wrote:
> Martin Pool wrote:
>> Fixing up 1.13's news prompted me to run a few regexps to reformat
>> NEWS along the lines discussed in the previous thread:
> 
> I like the new layout. We sure land this soon given the grief it
> will cause merging in changes based on the old format.
> 
> bb:tweak
> 
> Remember to pull across the NEWS items since this branch started.
> At a glance, that's at least:
> 
> * Jelmer's default-rich-root change
> * my DirState SHA1Provider parameter change
> * Robert's hook.pre_open change
> 
>> The diff is pretty noisy with the mechanical changes so I suggest you
>> look at the html result.
> 
> Long live meld for reviewing changes like this!
> 
> Ian C.

I personally find it a little bit easier to find where I'm at with the
current indenting, but not so much so that I would block the patch.

Oh and we shouldn't use "=========" at the top level, as it causes
problems with "bzr resolve" doing auto-resolve. We fixed it to '-----' a
while back because of this. Most other docs it doesn't really matter,
but NEWS conflicts all the time, so we want to make 'bzr resolve' clean
up as easily as possible.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknBrY8ACgkQJdeBCYSNAANotACffbtJEUcLYV/i5uv1Olfdx2SK
OBoAnAsARxu7o3rnHdw6dY/C4ZfwbP2x
=pHHW
-----END PGP SIGNATURE-----



More information about the bazaar mailing list