[RFC] treat NEWS specially

[Aaron Bentley]

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

Fabio Machado de Oliveira wrote:
> Robert Collins escreveu:
>> I propose that we sort the contents of each section of NEWS by the first
>> word as we do development. I think this will aid with conflicts.
>>
>> -Rob
> 
> If someday I could set that in a given file the order of the lines is
> unimportant, so the merge algorithm won't see these added lines as
> conflicting,
> because it can put them in any order, that would be a feature unique to
> bzr,

I have started work on a merge specifically for NEWS.  No ETA on
completion, but it will include a framework to support file-specific
merging.

It's not true that the order of lines is unimportant.  The order of
lines *within a section* is not critical, but it's nice if they appear
in the order they entered bzr.dev.

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

iD8DBQFG2GY70F+nu1YWqI0RAlOAAJwOSfuGO7Mxy4mthn8MhizlJoFrpQCeOkHS
X0klLqojypiGiS2UUfMudDc=
=dHOk
-----END PGP SIGNATURE-----