In order to resolve a merge issue, and in preparation
for the imminent 2.6.36 release, I have re-based the
XFS master branch (it now appears to be a series of
commits based on 2.6.36-rc8).
Because of this, if you have local branch that tracks
the XFS master branch you will need to use care in
updating it in order to get the right outcome. (At
the moment, a simple pull request will most likely
report conflicts.) You must forcibly update your
local branch to match the newly re-based XFS master
branch. To do this, you can supply a special refspec
to "git pull".
For example, if your local branch "xfs-master" is
tracking the XFS "master" branch on oss.sgi.com, you
would force the update like this:
git pull git://oss.sgi.com/xfs/xfs.git +master:xfs-master
This produces a few warning messages. When I did this with
xfs-master as my current branch I got:
From git://oss.sgi.com/xfs/xfs
+ 06e6f08...a731cd1 master -> xfs-master (forced update)
Warning: fetch updated the current branch head.
Warning: fast-forwarding your working tree from
Warning: commit 06e6f08768cf3e070a557ba812d7a65231e19dd6.
Already up-to-date.
You can use "git fetch" also, provided "xfs-master" is not
your current branch:
git fetch git://oss.sgi.com/xfs/xfs.git +master:xfs-master
Here I got:
From git://oss.sgi.com/xfs/xfs
+ 06e6f08...a731cd1 master -> xfs-master (forced update)
One other (unrelated) note, I pushed the 2.6.36-rc8 tag out
and it resulted in a message to the list. (I've suppressed
these messages in the past and thought I should mention it
since this time one went out.)
-Alex
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
