[pnfs] Error on git pull

Wed Mar 14 21:50:08 EDT 2007

Ok... I got the tree afresh and then decided I'd go for option #1. So, I
added the slot table code to the latest branch and then committed it. It
all worked fine. Then I tried to merge it into the pnfs tree... But got
an error. Here's what I did:

git checkout 4.1-sessions
<hack hack>
git add include/linux/nfs41_sessions.h
git commit -a
git checkout master
git merge 4.1-sessions
fatal: Needed a single revision
Usage: /usr/local/bin/git-merge [-n] [--no-commit] [-s <strategy>]...
<merge-message> <head> <remote>+

The git user manual seems to indicate that git merge <branchname> should
be fine...
Do I have to do something like
git-merge 4.1-sessions/HEAD

Regards
Rahul

> -----Original Message-----
> From: J. Bruce Fields [mailto:bfields at fieldses.org] 
> Sent: Tuesday, March 13, 2007 7:58 PM
> To: Iyer, Rahul
> Cc: pnfs at linux-nfs.org
> Subject: Re: [pnfs] Error on git pull
> 
> On Tue, Mar 13, 2007 at 10:19:20PM -0400, J. Bruce Fields wrote:
> > On Tue, Mar 13, 2007 at 05:46:26PM -0700, Iyer, Rahul wrote:
> > > 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.
> > 
> > Right.
> > 
> > > 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?
> > 
> > There's two ways to go:
> > 
> > 	1. merging: Patch the sessions branch, then merge those 
> changes into
> > 	   the pnfs branch.
> > 
> > 	2. rebasing: Patch the sessions branch, then tear the pnfs
> > 	   branch down and replace it with a new branch constructed
> > 	   by reapplying all of the patches in the pnfs branch to the
> > 	   newly patched sessions branch.
> > 
> > I can't decide which would work best.
> 
> (But, do it however you find easiest to explain the change 
> that needs to be made--if it's easiest just to make two 
> separate patches, one for sessions, one for pnfs, and send 
> them in, fine, we can sort it out.)
> 
> --b.
> 