[SCM] Samba Shared Repository - branch v3-2-test updated -
obnox at samba.org
Wed Jan 14 20:56:37 GMT 2009
Jeremy Allison wrote:
> On Wed, Jan 14, 2009 at 09:17:59AM +0100, Stefan (metze) Metzmacher wrote:
> > Jeremy Allison schrieb:
> > > The branch, v3-2-test has been updated
> > ...
> > >
> > > Summary of changes:
> > > source/include/proto.h |10358 ++++++++++++++++++++++++++++++++++++++++++++++
> > Why has that added proto.h to v3-2-test?
> Don't know. I'll remove it (it wasn't done intentionally).
Too late. ;-) [3ac7289b4d7fef830b05]
Jeremy, I suspect that you applied the patch from 3-3-test
(or master) with git cherry-pick (or git am). You have to
be careful then, because proto.h is checked into v3-3-test,
and so the patch contains a diff to proto.h. With cherry-pick
this will give you a conflict that is easily resolved by adding
the whole of proto.h. In such a case, when resolving the
conflict, you can e.g. "git add proto.h" and then "git rm proto.h"
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
Size: 206 bytes
Desc: not available
Url : http://lists.samba.org/archive/samba-technical/attachments/20090114/e6e0ff41/attachment.bin
More information about the samba-technical