[pnfs] Error on git pull

[Marc Eshel]

I see that my first set of changes for exchange_id are in master and are 
not in 4.1-sessions, so why should the rest of the fix got to 4.1-sessions 
? The last patch that I sent "[pnfs] [PATCH] update exchange id reply to 
draft 9" does apply cleanly on the master so I am not sure what is the 
problem ?
Marc.

"J. Bruce Fields" <bfields at fieldses.org> wrote on 03/13/2007 02:01:54 PM:

> On Tue, Mar 13, 2007 at 01:56:59PM -0700, Marc Eshel wrote:
> > pnfs-bounces at linux-nfs.org wrote on 03/13/2007 07:41:24 AM:
> > 
> > > On Tue, Mar 13, 2007 at 10:37:04AM -0400, J. Bruce Fields wrote:
> > > > On Mon, Mar 12, 2007 at 05:01:31PM -0700, Iyer, Rahul wrote:
> > > > > I got the error below on git pull. Is this because your merge is 
in
> > > > > progress?
> > > > 
> > > > Sorry about that; I should have warned you (and talked this over 
with
> > > > Andy) before making it public.  So there's now two branches:
> > > > 
> > > >    master (the default branch): has pNFS and and sessions
> > > >    4.1-sessions: sessions only
> > > 
> > > By the way, after setting that up I also took a look at the
> > > implementation-id-removal patch that's outstanding from Marc, as I 
did
> > > promise I'd help incorporate any work done in the meantime....
> > > Unfortunately that's one of the tricky cases where most of the 
changes
> > > belong in 4.1-sessions, so I might need a little help there.
> > 
> > So i have to do it on the session branch ? I have to some how make 
session 
> > my current branch, create a patch for it, and send it to Andy ?
> 
> Yup, should just be:
> 
>    git fetch origin
>    git checkout -b sessions origin/4.1-sessions
>    (hack hack hack)
>    git commit -a
>    git format-patch origin/4.1-sessions..
> 
> --b.