When is an RC not an RC?

[Jelmer Vernooij]

On Thu, 2012-10-04 at 13:40 +0200, steve wrote:
> On 04/10/12 10:33, Michael Wood wrote:
> > On 4 October 2012 09:30, steve <steve at steve-ss.com> wrote:
> >> On 04/10/12 07:24, Andrew Bartlett wrote:
> >>>
> >>> On Thu, 2012-10-04 at 06:59 +0200, Michael Wood wrote:
> >>>>
> >>>> On 4 October 2012 01:58, Andrew Bartlett <abartlet at samba.org> wrote:
> >>>>>
> >>>>> On Wed, 2012-10-03 at 08:41 +0200, Michael Wood wrote:
> >>>
> 
> >
> > I think that's v4-0-test.
> >
> > e.g. this should switch you to that branch:
> >
> > git checkout -b v4-0-test origin/v4-0-test
> >
> Hi Michael
> Thanks. I think I already had it:
>   git branch
> * master
>    v4-0-test
>    v4-1-test
> 
> git checkout v4-0-test
> M       source4/winbind/idmap.c
> Switched to branch 'v4-0-test'
> 
> git branch
>    master
> * v4-0-test
>    v4-1-test
> 
> Is this now correct for the 4.0 branch? What is the
> M       source4/winbind/idmap.c
There is a local change in your working directory that is not present in
the upstream branch. Did you perhaps edit that file at some point? "git
diff" should tell you.

Cheers,

Jelmer