On 30-Apr-2010, Ben Finney wrote: > AFAIK. It might merely be sloppy coding, but I don't know.
This was discussed on the BE list back when I was comming aboard in
Nov 2008 [1].
It is, actually, intentional, although I'm not sure if it actually
helps. The orginial mapfile formats included separating blank lines
with a `context` argument that set the number of blank lines [2]. The
idea was that if you placed enough blank space around each setting,
even dumb merge algorithms would realize that they should treat each
setting individually when merging, and not bother the user with
resolving false conflicts if a bug had been modified in different
branches.
When the on-disk mapfile format moved to YAML [3], I kept a blank line
after each entry for good luck. I don't think much effort has gone
into testing the merge-scenario this was designed to assist with, but
that's the idea. Perhaps we could make it a repository-wide option?
Cheers,
Trevor
[1]: See Aaron Bentley's comments in
[Be-devel] Re: set-root in git repository fails
Fri Nov 14 02:41:11 GMT 2008
Message-id: <[email protected]>
http://void.printf.net/pipermail/be-devel/2008-November/000063.html
[2]: See libbe/mapfiles in the following March 2005 revisions:
a23c9c6cfbcc2bc77e6723edc4e059bca82fa924
ae298bfe570ebe7f1bf184e3f58e17613f3962fb
[3]: See libbe/mapfiles in the December 2008 revision:
83e320a61eb74dab6eddfdda010f34fa42eedc0c
--
This email may be signed or encrypted with GPG (http://www.gnupg.org).
The GPG signature (if present) will be attached as 'signature.asc'.
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
My public key is at http://www.physics.drexel.edu/~wking/pubkey.txt
pgpwbNUXbBk3Y.pgp
Description: PGP signature
