On Tue, Apr 19, 2005 at 01:09:42AM +0200, Petr Baudis wrote:
Essentially, with BK, at 7am localtime each morning, I'd:
- update my baseline linux 2.6 tree
- for each working tree which may be pulled from
- if the baseline is a superset
- update working tree from baseline
On Sun, 2005-04-17 at 19:20 +0100, Russell King wrote:
On Sun, Apr 17, 2005 at 02:13:59PM -0400, David A. Wheeler wrote:
On Sun, 17 Apr 2005, Russell King wrote:
BTW, there appears to be errors in the history committed thus far.
I'm not sure where this came from though. Some of them could
On Sun, Apr 17, 2005 at 04:24:24PM -0700, Linus Torvalds wrote:
Tools absolutely matter. And it will take time for us to build up that
kind of helper infrastructure. So being newbie might be part of it, but
it's the smaller part, I say. Rough interfaces is a big issue.
Speaking of tools,
On Mon, 18 Apr 2005, Russell King wrote:
Ok, I just tried pulling your tree into the tree you pulled from, and
got this:
No, that can't work. The pesky tools are helpful, but they really don't do
merges worth cr*p right now, excuse my french.
The _real_ way to pull is to do the (horribly
On Mon, 18 Apr 2005 08:04:57 -0700 Greg KH wrote:
| On Sun, Apr 17, 2005 at 04:24:24PM -0700, Linus Torvalds wrote:
|
| Tools absolutely matter. And it will take time for us to build up that
| kind of helper infrastructure. So being newbie might be part of it, but
| it's the smaller part,
On Mon, 18 Apr 2005, Greg KH wrote:
On Sun, Apr 17, 2005 at 04:24:24PM -0700, Linus Torvalds wrote:
Tools absolutely matter. And it will take time for us to build up that
kind of helper infrastructure. So being newbie might be part of it, but
it's the smaller part, I say. Rough
On Mon, 18 Apr 2005, Linus Torvalds wrote:
No, that can't work. The pesky tools are helpful [...]
I'm afraid that until Pasky's tools script this properly, [... ]
If Pesky wants to take the above script, test it, [...]
Ok, one out of three isn't too bad, is it? Pesky/Pasky, so close yet so
Dear diary, on Mon, Apr 18, 2005 at 07:05:19PM CEST, I got a letter
where Linus Torvalds [EMAIL PROTECTED] told me that...
On Mon, 18 Apr 2005, Linus Torvalds wrote:
No, that can't work. The pesky tools are helpful [...]
I'm afraid that until Pasky's tools script this properly, [... ]
On Mon, Apr 18, 2005 at 10:23:32AM +0100, Russell King wrote:
On Sun, Apr 17, 2005 at 04:24:24PM -0700, Linus Torvalds wrote:
On Sun, 17 Apr 2005, Russell King wrote:
I pulled it tonight into a pristine tree (which of course worked.)
Goodie.
Note the pristine. Now comes the real
On Mon, 18 Apr 2005, Russell King wrote:
Since this happened, I've been working out what state my tree is in,
and I restored it back to a state where I had one dangling commit head,
which was _my_ head.
For the future, if your tree gets messed up to the point where you say
screw it and
On Mon, Apr 18, 2005 at 08:42:14AM -0700, Linus Torvalds wrote:
On Mon, 18 Apr 2005, Greg KH wrote:
On Sun, Apr 17, 2005 at 04:24:24PM -0700, Linus Torvalds wrote:
Tools absolutely matter. And it will take time for us to build up that
kind of helper infrastructure. So being
On Mon, Apr 18, 2005 at 03:05:41PM -0700, Greg KH wrote:
On Mon, Apr 18, 2005 at 08:42:14AM -0700, Linus Torvalds wrote:
On Mon, 18 Apr 2005, Greg KH wrote:
On Sun, Apr 17, 2005 at 04:24:24PM -0700, Linus Torvalds wrote:
Tools absolutely matter. And it will take time for us
Ok, since the last one was soo successful, and I'm up for more
punishment, here's another attempt. The diffstat is rather
interesting in this one, claiming no changes. It should look
like this:
arch/arm/lib/bitops.h | 33 +
1 files changed, 33 insertions(+)
Dear diary, on Mon, Apr 18, 2005 at 11:53:57PM CEST, I got a letter
where Russell King [EMAIL PROTECTED] told me that...
Maybe Petr can improve the error handling, and incorporate it (or at
least some of it) into git-pasky
This does not need to touch git pull at all now; all the relevant logic
On Tue, Apr 19, 2005 at 12:48:52AM +0200, Petr Baudis wrote:
Dear diary, on Mon, Apr 18, 2005 at 11:53:57PM CEST, I got a letter
where Russell King [EMAIL PROTECTED] told me that...
Maybe Petr can improve the error handling, and incorporate it (or at
least some of it) into git-pasky
This
On Mon, 18 Apr 2005, Greg KH wrote:
Hm, have you pushed all of the recent changes public?
Oops. Obviously not. Will fix.
Linus
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at
Dear diary, on Tue, Apr 19, 2005 at 12:59:52AM CEST, I got a letter
where Russell King [EMAIL PROTECTED] told me that...
In the case I highlighted, we don't want to end up having to require
user intervention. This is a common case here, and was one which was
entirely scripted with BK.
Well,
On Mon, 18 Apr 2005, Greg KH wrote:
Anyway, I try it this way and get:
You should update to the newest version anyway..
$ dotest ~/linux/patches/usb/usb-visor-tapwave_zodiac.patch
Applying USB: visor Tapwave Zodiac support patch
fatal: preparing to update file
On Tue, 19 Apr 2005, Petr Baudis wrote:
What is actually a little annoying is having to cd ,,merge and then
back, though. I don't know, but the current pull-merge script does not
bother with the temporary merge directory neither, even though Linus
wanted it. Linus, do you still do? ;-)
Dear diary, on Tue, Apr 19, 2005 at 12:16:52AM CEST, I got a letter
where Russell King [EMAIL PROTECTED] told me that...
However, it seems that git diff can't handle new files appearing
yet.
Fixed. :-)
--
Petr Pasky Baudis
Stuff: http://pasky.or.cz/
C++: an
On Sat, Apr 16, 2005 at 04:01:45PM -0700, Linus Torvalds wrote:
So I re-created the dang thing (hey, it takes just a few minutes), and
pushed it out, and there's now an archive on kernel.org in my public
personal directory called linux-2.6.git. I'll continue the tradition
of naming git-archive
Dear diary, on Sun, Apr 17, 2005 at 05:24:48PM CEST, I got a letter
where Russell King [EMAIL PROTECTED] told me that...
However, I've made a start to generate the necessary emails. How about
this format?
I'm not keen on the tree, parent, author and committer objects appearing
in this -
On Sun, 17 Apr 2005, Russell King wrote:
On Sat, Apr 16, 2005 at 04:01:45PM -0700, Linus Torvalds wrote:
So I re-created the dang thing (hey, it takes just a few minutes), and
pushed it out, and there's now an archive on kernel.org in my public
personal directory called linux-2.6.git.
On Sun, 17 Apr 2005, Russell King wrote:
BTW, there appears to be errors in the history committed thus far.
I'm not sure where this came from though. Some of them could be
UTF8 vs ASCII issues, but there's a number which seem to have extra
random crap in them (^M) and lots of blank
Dear diary, on Sun, Apr 17, 2005 at 08:13:59PM CEST, I got a letter
where David A. Wheeler [EMAIL PROTECTED] told me that...
On Sun, 17 Apr 2005, Russell King wrote:
BTW, there appears to be errors in the history committed thus far.
I'm not sure where this came from though. Some of them could
On Sun, 17 Apr 2005, Russell King wrote:
One thing which definitely needs to be considered is - what character
encoding are the comments to be stored as?
...
I replied:
I would _heartily_ recommend moving towards UTF-8 as the
internal charset for all comments.
Petr said:
Not that the plumbing
On Sun, Apr 17, 2005 at 09:36:09AM -0700, Linus Torvalds wrote:
On Sun, 17 Apr 2005, Russell King wrote:
On Sat, Apr 16, 2005 at 04:01:45PM -0700, Linus Torvalds wrote:
So I re-created the dang thing (hey, it takes just a few minutes), and
pushed it out, and there's now an archive on
On Sun, 17 Apr 2005, Russell King wrote:
This will (and does) do exactly what I want. I'll also read into the
above a request that you want it in forward date order. 8)
No, I actually don't _think_ I care. In many ways I'm more used to
reverse date order, because that's usually how you
Linus Torvalds wrote:
Ie we have two phases to the merge: first get the objects, with something
like
repo=kernel.org:/pub/kernel/people/torvalds/linux-2.6.git
rsync --ignore-existing -acv $(repo)/ .git/
Could you place a tarball there for people like me who are no real
kernel hackers and
On Sun, 17 Apr 2005, Russell King wrote:
I pulled it tonight into a pristine tree (which of course worked.)
Goodie.
In doing so, I noticed that I'd messed up one of the commits - there's
a missing new file. Grr. I'll put that down to being a newbie git.
Actually, you should put that
30 matches
Mail list logo
