powerpc.git tree

powerpc.git tree

[Paul Mackerras]

All of the patches in the powerpc.git tree have now been either sent
upstream to Linus' tree, or reverted.

For various reasons I didn't just ask Linus to pull the powerpc.git
tree, but instead cherry-picked the commits into the powerpc-merge.git
tree and asked Linus to pull that.  That means that there are now
commits in the powerpc.git tree that are superseded by commits in
Linus' tree.

In future I'd like to be able to ask Linus to pull the powerpc.git
tree, without cluttering up his tree with those superseded commits.
That means I need to reset the powerpc.git tree to be the same as
Linus' tree now.

That means that anyone who is following the powerpc.git tree by doing
pulls periodically will need to reset their tree too.  Otherwise each
pull will do an unnecessary merge.

If that would cause people serious heartburn, I can instead abandon
the powerpc.git tree and start a new development tree
(powerpc-devel.git perhaps).

Comments?

Paul.

Re: powerpc.git tree

[Dan Malek]

On Jan 11, 2006, at 6:24 AM, Paul Mackerras wrote:

> If that would cause people serious heartburn, I can instead abandon
> the powerpc.git tree and start a new development tree
> (powerpc-devel.git perhaps).

 From past experience, creating another tree, especially something
called "devel" only caused more problems :-)  Please, just do what
you think is best for the powerpc.git tree and we'll just move forward.

Thanks.

	-- Dan

Re: powerpc.git tree

[Jon Loeliger]

On Wed, 2006-01-11 at 05:24, Paul Mackerras wrote:
> All of the patches in the powerpc.git tree have now been either sent
> upstream to Linus' tree, or reverted.

Yeah!

> In future I'd like to be able to ask Linus to pull the powerpc.git
> tree, without cluttering up his tree with those superseded commits.

Can you give us a work-flow statement that covers
the powerpc.git and powerpc-merge.git trees?  When do
patches hit on-or-the-other tree?  What is the purpose
of the two trees, especially given that "merge" work
is also "development" work.  When will the two trees
be slated for upstream Linus pullage?

That sort of thing. :-)

> That means I need to reset the powerpc.git tree to be the same as
> Linus' tree now.

Oh boy!  One shoe...

> That means that anyone who is following the powerpc.git tree by doing
> pulls periodically will need to reset their tree too.  Otherwise each
> pull will do an unnecessary merge.

Two shoe...

> If that would cause people serious heartburn, I can instead abandon
> the powerpc.git tree and start a new development tree
> (powerpc-devel.git perhaps).

'S ok with me either way.  Just give us a "I did this, you
now need to do that" statement as needed!

Now, what we really need is a U-Boot tree in which we can
dump the corresponding OF bits.  Any chance we could get
one set up at kernel.org that might later be pulled into
WD's tree and simplify his life too?

Thanks!
jdl

Re: powerpc.git tree

[will schmidt]

Paul Mackerras wrote:
> 
> That means that anyone who is following the powerpc.git tree by doing
> pulls periodically will need to reset their tree too.  Otherwise each
> pull will do an unnecessary merge.

Hi Paul,

   By reset, do you mean to delete the local tree and pull a fresh one, or something fancier?


-Will
> 
> Comments?
> 
> Paul.
> _______________________________________________
> Linuxppc64-dev mailing list
> Linuxppc64-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc64-dev

Re: powerpc.git tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 646 bytes --]

Hi Will,

On Wed, 11 Jan 2006 13:11:14 -0600 will schmidt <will_schmidt@vnet.ibm.com> wrote:
>
> Paul Mackerras wrote:
> > 
> > That means that anyone who is following the powerpc.git tree by doing
> > pulls periodically will need to reset their tree too.  Otherwise each
> > pull will do an unnecessary merge.
> 
>    By reset, do you mean to delete the local tree and pull a fresh one, or something fancier?

I just did a "git fetch -f powerpc" where my .git/remotes/powerpc points
at the powerpc.git tree on kernel.org.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: powerpc.git tree

[Paul Mackerras]

will schmidt writes:

> Paul Mackerras wrote:
> > 
> > That means that anyone who is following the powerpc.git tree by doing
> > pulls periodically will need to reset their tree too.  Otherwise each
> > pull will do an unnecessary merge.
> 
> Hi Paul,
> 
>    By reset, do you mean to delete the local tree and pull a fresh
>    one, or something fancier? 

The powerpc.git tree is now identical to Linus' tree as of a day or so
ago.  There are several ways you can reset your tree:

- make a fresh clone of Linus' tree, and make its .git/remotes/powerpc
  point at the powerpc.git tree on kernel.org, or

- do "git fetch -f powerpc" (substitute whatever remote name you use
  for the powerpc.git tree) (according to Stephen Rothwell), or

- do a pull as you would normally do, then throw away the merge and
  the extra objects by doing:
	git reset --hard FETCH_HEAD
	git prune

- or you can delete the local tree and do a fresh clone.

I will start putting stuff in powerpc.git in the next day or so.

Paul.