"merge" branch reset in powerpc.git tree

"merge" branch reset in powerpc.git tree

[Paul Mackerras]

If you are following the powerpc.git tree, and you pull the "merge"
branch, you will need to reset it to have commit ID
5fa21d821f6972e70942f2c555ec29dde962bdb2 as its head.  That's also the
head of the "master" branch and of Linus' linux-2.6 tree at the
moment.

This is because there was a merge between the "master" branch and the
linux-2.6 tree which Linus didn't pull - instead he did a new merge.
The merge I did is now redundant, and needs to be removed to keep the
powerpc and linux-2.6 trees in sync.

Paul.

"merge" branch reset in powerpc.git tree

[Dave C Boutcher]

On Fri, 23 Jun 2006 21:44:58 +1000, Paul Mackerras <paulus@samba.org> said:
> 
> If you are following the powerpc.git tree, and you pull the "merge"
> branch, you will need to reset it to have commit ID
> 5fa21d821f6972e70942f2c555ec29dde962bdb2 as its head.  That's also the
> head of the "master" branch and of Linus' linux-2.6 tree at the
> moment.

At risk of appearing like a git ignoramous...could you post the
command to perform such a reset?

Thanks

Dave B

Re: "merge" branch reset in powerpc.git tree

[Josh Boyer]

On Fri, 2006-06-23 at 11:48 -0500, Dave C Boutcher wrote:
> On Fri, 23 Jun 2006 21:44:58 +1000, Paul Mackerras <paulus@samba.org> said:
> > 
> > If you are following the powerpc.git tree, and you pull the "merge"
> > branch, you will need to reset it to have commit ID
> > 5fa21d821f6972e70942f2c555ec29dde962bdb2 as its head.  That's also the
> > head of the "master" branch and of Linus' linux-2.6 tree at the
> > moment.
> 
> At risk of appearing like a git ignoramous...could you post the
> command to perform such a reset?

Run the following in that branch:

git reset --hard 5fa21d821f6972e70942f2c555ec29dde962bdb2

That will reset the branch to the commit ID.  NOTE:  If you have local
changes on top, they will be wiped out.

There might be a way to do it without losing local changes, but I'm a
git idiot myself still.

josh

Re: "merge" branch reset in powerpc.git tree

[Arnd Bergmann]

On Friday 23 June 2006 21:10, Josh Boyer wrote:
> git reset --hard 5fa21d821f6972e70942f2c555ec29dde962bdb2
>=20
> That will reset the branch to the commit ID. =A0NOTE: =A0If you have local
> changes on top, they will be wiped out.
>=20
> There might be a way to do it without losing local changes, but I'm a
> git idiot myself still.
>=20
My understanding is that you are not supposed to have local changes
on the branch you are pulling into, but have another branch for
merging the remote tree with your own changes.

Then again, I'm pretty clueless about git as well.

	Arnd <><

Re: "merge" branch reset in powerpc.git tree

[Josh Boyer]

On Fri, 2006-06-23 at 21:24 +0200, Arnd Bergmann wrote:
> On Friday 23 June 2006 21:10, Josh Boyer wrote:
> > git reset --hard 5fa21d821f6972e70942f2c555ec29dde962bdb2
> > 
> > That will reset the branch to the commit ID.  NOTE:  If you have local
> > changes on top, they will be wiped out.
> > 
> > There might be a way to do it without losing local changes, but I'm a
> > git idiot myself still.
> > 
> My understanding is that you are not supposed to have local changes
> on the branch you are pulling into, but have another branch for
> merging the remote tree with your own changes.

True.  But there is nothing to prevent people from doing it.  So I was
just warning them :).

josh