[pnfs] Error on git pull

[Iyer, Rahul]

Since my changes are gonna be blown away anyways, I might as well make a
patch of my changes and then get the tree anew. So, here's my question:
All of the sessions code will need to be applied to both the pNFS tree
and well as the "sessions only" tree. If the sessions code goes into the
sessions tree, do I need to apply them locally to the pNFS tree and then
send a patch for that tree too?
Regards
Rahul


> -----Original Message-----
> From: J. Bruce Fields [mailto:bfields at fieldses.org] 
> Sent: Tuesday, March 13, 2007 2:02 PM
> To: Marc Eshel
> Cc: Iyer, Rahul; pnfs at linux-nfs.org
> Subject: Re: [pnfs] Error on git pull
> 
> 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.
> _______________________________________________
> pNFS mailing list
> pNFS at linux-nfs.org
> http://linux-nfs.org/cgi-bin/mailman/listinfo/pnfs
>