From: Dave Airlie <airlied@linux.ie>
To: linux-kernel@vger.kernel.org, torvalds@osdl.org
Subject: git-pull-script on my linus tree fails..
Date: Tue, 21 Jun 2005 13:07:12 +0100 (IST) [thread overview]
Message-ID: <Pine.LNX.4.58.0506211304320.2915@skynet> (raw)
I had a git archive from just after 2.6.12-rc6, which I've not touched on
my local system..
Now I've just done
cd linux-2.6
git-pull-script rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
And I get:
sent 69638 bytes received 17423079 bytes 52928.04 bytes/sec
total size is 135185594 speedup is 7.73
Updating from 27198d855abbfc82df69e81b6c8d2f333580114c to
1d345dac1f30af1cd9f3a1faa12f9f18f17f236e.
Destroying all noncommitted data!
Kill me within 3 seconds..
fatal: Entry 'Documentation/DocBook/scsidrivers.tmpl' would be overwritten
by merge. Cannot merge.
but I haven't touched that tree so I shouldn't get merge issues..
whatsup?
Dave.
--
David Airlie, Software Engineer
http://www.skynet.ie/~airlied / airlied at skynet.ie
Linux kernel - DRI, VAX / pam_smb / ILUG
next reply other threads:[~2005-06-21 12:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-21 12:07 Dave Airlie [this message]
2005-06-21 15:39 ` Linus Torvalds
2005-06-21 15:56 ` Jeff Garzik
2005-06-21 17:06 ` Linus Torvalds
2005-06-21 17:28 ` Jeff Garzik
2005-06-21 17:42 ` Linus Torvalds
2005-06-21 17:53 ` Jeff Garzik
2005-06-21 18:08 ` Linus Torvalds
2005-06-21 18:17 ` Jeff Garzik
2005-06-21 18:25 ` Linus Torvalds
2005-06-21 23:52 ` Jeff Garzik
2005-06-21 23:54 ` Jeff Garzik
2005-06-22 0:13 ` Linus Torvalds
2005-06-22 0:46 ` Jeff Garzik
2005-06-22 1:18 ` Linus Torvalds
2005-06-22 5:51 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.58.0506211304320.2915@skynet \
--to=airlied@linux.ie \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®