[RFC] treat NEWS specially

Fabio Machado de Oliveira absfabio at terra.com.br
Fri Aug 31 19:59:37 BST 2007


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,
that would solve not only the problem with the NEWS file, but some problems
I have at work with some big configuration files where the line ordering doesnt
matter, that are used in many branches.

I am not sure how much people would be benefited, but at least for me it would
be a good thing. And perhaps one more point to help convincing the powers that
be that there is enough benefits in switching away from cvs.




More information about the bazaar mailing list