[Pkg-openldap-devel] r623 - openldap/trunk-2.3/debian

[Matthijs Mohlmann]

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

Russ Allbery wrote:
> Matthijs Mohlmann <matthijs at cacholong.nl> writes:
> 
>>Quanah Gibson-Mount wrote:
>>
>>>Matthijs Mohlmann <active2-guest at costa.debian.org> wrote:
> 
> 
>>>>Author: active2-guest
>>>>Date: 2006-02-21 08:37:38 +0000 (Tue, 21 Feb 2006)
>>>>New Revision: 623
> 
> 
>>>I would import OpenLDAP 2.3.20 while you are busy making changes
>>>here. ;)
> 
> 
>>Go ahead, I am still going through the bugpage
>>(http://bugs.debian.org/src:openldap2.2) and fixing bugs. But I can wait
>>until you have committed the new upstream release. :)
> 
> 
> Could someone check me on this:  Import into vendor/openldap-stable, copy
> to vendor/openldap-2.3.20, and then merge into trunk-2.3?  (Every project
> seems to do this slightly differently.)
> 
The last time I took just a diff between the version current in
trunk-2.3 and the new one I wanted to import. But I think it is also
possible to do it your way with one difference I think:

import into vendor/openldap-2.3.20
copy to vendor/openldap-stable
merge with trunk-2.3

Let us know when the merging is done, those changes are usually bigger
then 40kb and the listmanager doesn't send them out to this mailinglist.

> If so, Quanah, swing by my office this afternoon (3pm or later) and we'll
> do this together; I'll show you how it works.
> 

I recommend you als a cup of coffee. ;)

Regards,

Matthijs Mohlmann
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD+4wo2n1ROIkXqbARArw+AJ9c2PXiYslTOix06CK1566Q3X92rQCeL2yJ
+HLWUrdknzFXiIXDzJXR8jM=
=fWBW
-----END PGP SIGNATURE-----