xfs
[Top] [All Lists]

Re: [XFS updates] XFS development tree annotated tag, v2.6.34, created.

To: xfs@xxxxxxxxxxx
Subject: Re: [XFS updates] XFS development tree annotated tag, v2.6.34, created. v2.6.34
From: Alex Elder <aelder@xxxxxxx>
Date: Wed, 19 May 2010 15:52:10 -0500
In-reply-to: <201005192008.o4JK8CGB151692@xxxxxxxxxxx>
References: <201005192008.o4JK8CGB151692@xxxxxxxxxxx>
Reply-to: aelder@xxxxxxx
On Wed, 2010-05-19 at 15:08 -0500, xfs@xxxxxxxxxxx wrote:
> This is an automated email from the git hooks/post-receive script. It was
> generated because a ref change was pushed to the repository containing
> the project "XFS development tree".
> 
> The annotated tag, v2.6.34 has been created
>         at  dba2e709efc365df385a762e763b51365403bc0f (tag)
>    tagging  e40152ee1e1c7a63f4777791863215e3faa37a86 (commit)
>   replaces  v2.6.34-rc7
>  tagged by  Linus Torvalds
>         on  Sun May 16 14:17:44 2010 -0700

I'm not sure why each tag generates its own e-mail message
to the list; they were all the result of a single "git push"
operation.

Now that 2.6.34 is out I have re-based the XFS master branch.

I jumped the gun when I first pushed that change, and if you
have already pulled in the changes you may have to do it again.

You can do so with the following sequence of commands.
It assumes that git://oss.sgi.com/xfs/xfs.git is your
git repository's "origin" remote, with its "master"
branch tracked by a local branch by the same name.
It also presumes your working directory is clean.

    git remote update origin
    git fetch origin +master:master

If your current branch is "master" you may get an error.
In that case, do this:

    git checkout -b temporary
    git remote update origin
    git fetch origin +master:master
    git checkout master
    git branch -d temporary

Sorry for the inconvenience.

                                        -Alex

<Prev in Thread] Current Thread [Next in Thread>