Okay,
I selected the origin/v3-5-test and tested the patch with git apply --check.
I see the same error message as before. I also confirmed that the new
branch I created for the build is the current branch via git branch.
Derek
-----Original Message-----
From: Jeremy Allison [mailto:jra at samba.org]
Sent: Thursday, October 28, 2010 10:26 AM
To: Derek Lewis
Cc: samba at lists.samba.org
Subject: Re: [Samba] Samba 3.5.6 jumbo patch
On Wed, Oct 27, 2010 at 10:14:48PM -0700, Derek Lewis
wrote:> I have cloned the samba git file and selected the version with the tag:
> release-3-5-6. I tested the patch with git apply -check, and I get the
> following error:
>
> Error: patch failed: source3/smbd/posix_acls.c:3856
>
> Error: source3/smbd/posix_acls.c: patch does not apply.
Hmmm. Try "v3-5-test", not the release branch. The v3-5-test
branch is what becomes the next release.
Jeremy.