Re: : Networking
- From
Petr Baudis <pasky@ucw.cz>
- Date
- Apr 26, 2005, 18:15 UTC
- Message-ID
- <20050426181554.GA13224@pasky.ji.cz>
- In-Reply-To
- <Pine.LNX.4.21.0504261114090.30848-100000@iabervon.org>
Dear diary, on Tue, Apr 26, 2005 at 05:40:08PM CEST, I got a letter where Daniel Barkalow <barkalow@iabervon.org> told me that...
Show 15 quoted lines
> On Tue, 26 Apr 2005, Linus Torvalds wrote: > > > On Tue, 26 Apr 2005, Andrew Morton wrote: > > > > > > > The only thing you should be a bit careful about is to remember what the > > "heads" at different points were. In particular, you want to remember > > where you merged with me last was. I've started tagging my releases with > > the git tag facility (_not_ the pasky one, but I think pasky will start > > picking up on that soon enough), so finding a specific release will be > > easy, but if you ever do a non-release merge you'll just have to tag it > > yourself. > > Your tag system is in the "cogito-0.8" release, plus a pasky-style way of > keeping track of what tags you have in your repository.
It came in with merge with Linus, but there's no support in the Cogito toolkit for it whatsoever.
I'm personally unlikely to get any time for doing it (or much anything else; but this is probably the priority now) until Sunday evening. :-(
Show 15 quoted lines
> > > d) To generate davem's tree (patch against linus's current tree (ie: patch > > > against 2.6.12-rc3+linus.patch)): > > > > > > git pull git-net > > > > Yes. This should have merged the two (assuming "git pull" does what I > > think it does). > > I think git pull only downloads the contents of the repo and saves the new > head in a separate file. You're left to do the merge yourself, in case > what you actually wanted to do was just read the patches in the remote > repo without merging them. > > You probably need a "git merge git-net" here, and things will be in the > state that Linus expects.
Yes. git pull only pulls the stuff, doesn't merge it (that is, unless it is tracked branch; but I think this isn't the case; this was cleaned up in cogito-0.8 and cg-pull now always only pulls, cg-update pulls+merges).
-- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor