Question of changes in v3-2-test and beyond

[Michael Adam]

Jelmer Vernooij wrote:
> Am Mittwoch, den 23.04.2008, 15:13 -0500 schrieb Gerald (Jerry) Carter:
> > Karolin has called for the 3.20pre3 on Friday, April 25.
> > 
> > I've posted a list of changes in v3-2-test that have yet
> > to be merged at http://www.samba.org/~jerry/picks.log
> > 
> > Main questions I need some help with:
> 
> >   * Jelmer & Gunther, what about the librpc and IDL changes?
> 
> ac4c63d999f9ae61428bcdae400d127459896d6c has to be cherrypicked but I
> seem to be having some problems doing so. Git says it cherrypicked it
> ok, but I can't find it anywhere...

git cherry-pick on that hash gives me conflicts.

Did you try cherry-picking in v3-2-test instead of v3-2-stable?

Cheers - Michael

-- 
Michael Adam <ma at sernet.de>  <obnox at samba.org>
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.SerNet.DE, mailto: Info @ SerNet.DE
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 206 bytes
Desc: not available
Url : http://lists.samba.org/archive/samba-technical/attachments/20080425/3c0eac08/attachment.bin