CVS update: samba/source

[Jeremy Allison]

Andrew Tridgell wrote:
> 
> > Added the same changes (strict sync, locking changes and file open changes)
> > to Andrew's autoconf branch as were added to HEAD. Should make the merge
> 
> no!
> 
> please don't do this. too late. uggh.
> 
> I automate the merge by getting cvs to produce a diff of what has
> changed on the main branch then patching that on the autoconf
> branch. It makes merging really easy and totally automated.
> 
> now I'll need to do it manually :)

Oh, I'm really sorry Andrew, I thought I was doing
you a favour. And I've done it twice now :-(.

Sorry,

	Jeremy.


-- 
--------------------------------------------------------
Buying an operating system without source is like buying
a self-assembly Space Shuttle with no instructions.
--------------------------------------------------------