On Mon, Mar 9, 2009 at 1:46 PM, James Youngman wrote:
> On Mon, Mar 9, 2009 at 2:34 AM, Eric Blake wrote:
>> -BEGIN PGP SIGNED MESSAGE-
>> Hash: SHA1
>>
>> According to James Youngman on 3/8/2009 7:43 AM:
>>> * .gitattributes: new file
>>
>> You went with the name merge.cl-merge.driver, w
On Mon, Mar 9, 2009 at 2:34 AM, Eric Blake wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
>
> According to James Youngman on 3/8/2009 7:43 AM:
>> * .gitattributes: new file
>
> You went with the name merge.cl-merge.driver, while gnulib, coreutils,
> autoconf, libtool, and m4 all used mer
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
According to James Youngman on 3/8/2009 7:43 AM:
> * .gitattributes: new file
You went with the name merge.cl-merge.driver, while gnulib, coreutils,
autoconf, libtool, and m4 all used merge.merge-changelog.driver. I think
it would be nice to go with
On Sun, Mar 8, 2009 at 1:43 PM, James Youngman wrote:
> * import-gnulib.sh (check_merge_driver): New function; verifies
> that we have a merge driver installed for the ChangeLog file (if
> we're on the master or release branch, the check is skipped).
> Also check that the .gitattributes file exist
* import-gnulib.sh (check_merge_driver): New function; verifies
that we have a merge driver installed for the ChangeLog file (if
we're on the master or release branch, the check is skipped).
Also check that the .gitattributes file exists.
* README-hacking: Point out that using a merge driver for Ch
