directory-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Pierre-Arnaud Marcelot>
Subject Re: Latest trunk test failures on Windows XP
Date Fri, 10 Dec 2010 08:18:17 GMT
Hi Emmanuel,

On 10 déc. 2010, at 01:32, Emmanuel Lecharny wrote:

> Hi Antoine,
> I have merged your branch into trunk, except the config.ldif file, because it's way too
complex to merge it (there are hundreds of line, and for some unknown reason, svn diff sees
both files as completely different.

Hum, probably my fault, as I made some changes to the config.ldif file in the branch I merged

Sorry about it...


> Can you tell me what entries you have modified ? you should be able to easily do that
by doing a diff on your disk.
> Many thanks !
> -- 
> Regards,
> Cordialement,
> Emmanuel Lécharny

View raw message