Linus Torvalds [EMAIL PROTECTED] writes:
Real merges have no patches taking place _anywhere_. And they take about
half a second. Doing an update of your tree should _literally_ boil down
to
#
# repo needs to point to the repo we update from
#
rsync -avz
On Wed, 20 Apr 2005, Zlatko Calusic wrote:
I see this -avz incantation mentioned everytime when rsync is
involved. But, is the -z part (compression) really necessary knowing
that we're dealing with an already compressed tree? Doesn't it put
additional strain on the rsync server without any
On Tue, 19 Apr 2005, Greg KH wrote:
Nice, it looks like the merge of this tree, and my usb tree worked just
fine.
Yup, it all seems to work out.
So, what does this now mean? Is your kernel.org git tree now going to
be the real kernel tree that you will be working off of now? Should
we
On Tue, Apr 19, 2005 at 12:40:44PM -0700, Linus Torvalds wrote:
I'm still working out some performance issues with merges (the actual
merge operation itself is very fast, but I've been trying to make the
subsequent update the working directory tree to the right thing be much
better).
Ok, if
Linus Torvalds wrote:
On Tue, 19 Apr 2005, Greg KH wrote:
Nice, it looks like the merge of this tree, and my usb tree worked just
fine.
Yup, it all seems to work out.
[many files patched]
patching file mm/mmap.c
patching file net/bridge/br_sysfs_if.c
patching file scripts/ver_linux
On Tue, 2005-04-19 at 15:00 -0700, Linus Torvalds wrote:
On Tue, 19 Apr 2005, Greg KH wrote:
It looks like your domain name isn't set up properly for your box (which
is why it worked for you, but not me before, causing that patch).
No, I think it's a bug in your domainname changes. I
On Tue, Apr 19, 2005 at 06:27:38PM -0400, Daniel Jacobowitz wrote:
On Tue, Apr 19, 2005 at 03:00:04PM -0700, Linus Torvalds wrote:
On Tue, 19 Apr 2005, Greg KH wrote:
It looks like your domain name isn't set up properly for your box (which
is why it worked for you, but not me
On Tue, 19 Apr 2005, Steven Cole wrote:
But perhaps a progress bar right about here might be
a good thing for the terminally impatient.
real3m54.909s
user0m14.835s
sys 0m10.587s
4 minutes might be long enough to cause some folks to lose hope.
Well, the real operations
Dear diary, on Tue, Apr 19, 2005 at 10:20:47PM CEST, I got a letter
where Linus Torvalds [EMAIL PROTECTED] told me that...
Pasky? Can you check my latest git stuff, notably read-tree.c and the
changes to git-pull-script?
I've made git merge to use read-tree -m, HTH.
I will probably not buy
PB == Petr Baudis [EMAIL PROTECTED] writes:
PB I'm wondering if doing
PB if [ $(show-diff) ]; then
PB git diff | git apply
PB else
PB checkout-cache -f -a
PB fi
PB would actually buy us some time; or, how common is it for people to have
PB no local changes whatsoever, and whether
Dear diary, on Wed, Apr 20, 2005 at 12:45:02AM CEST, I got a letter
where Junio C Hamano [EMAIL PROTECTED] told me that...
PB == Petr Baudis [EMAIL PROTECTED] writes:
PB I'm wondering if doing
PB if [ $(show-diff) ]; then
PB git diff | git apply
PB else
PB checkout-cache -f -a
PB
On Tuesday 19 April 2005 04:38 pm, Linus Torvalds wrote:
On Tue, 19 Apr 2005, Steven Cole wrote:
But perhaps a progress bar right about here might be
a good thing for the terminally impatient.
real3m54.909s
user0m14.835s
sys 0m10.587s
4 minutes might be long
Alright, let's try some small i2c and w1 patches...
Could you merge with:
kernel.org/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git/
It contains 4 small patches, 2 i2c and 2 w1 bugfixes, diffstat is
below, I'll figure out how to send the individual patches later.
thanks,
greg k-h
13 matches
Mail list logo