Re: Unify line endings in localization test

[Eric Blake]

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

According to Ralf Wildenhues on 1/24/2009 2:37 AM:
>> One funny thing (funny strange, not haha) is that the ChangeLog entries
>> from master appeared in reverse order in the pr-msvc-support ChangeLog
>> after the merge, and I had to fix that up manually. Pure luck I noticed
>> that one...
> 
> Are you using the git-merge-changelog merge driver from gnulib?
> If yes, then it's probably an artefact of that driver.

It also matters which branch is considered 'upstream' when running that
driver; it tries to place your edits at the top of the file, but depending
on which branch you are on at the time of the merge, it might guess wrong
on which entries qualify as your edits vs. upstream edits.

> 
> Maybe we should think about not having a manually edited ChangeLog file,
> but a generated one, just like coreutils.

Personally, I like a checked-in ChangeLog; with a generated one, you have
no way to fix typos in previous entries short of running a git filter
operation and changing history.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkl7EN8ACgkQ84KuGfSFAYBAeQCfcDPFPQgXz3HIPO+R7vJRT+M+
Q7IAnAhrh+EW7v8IxM1wgcN7IIi0cAFs
=wPT8
-----END PGP SIGNATURE-----