From: Martin Schlemmer <azarah@nosferatu•za.org>
To: Russell King <rmk@arm•linux.org.uk>
Cc: Linus Torvalds <torvalds@osdl•org>, Petr Baudis <pasky@ucw•cz>,
Git Mailing List <git@vger•kernel.org>
Subject: Re: Re-done kernel archive - real one?
Date: Mon, 18 Apr 2005 13:14:50 +0200 [thread overview]
Message-ID: <1113822890.16288.19.camel@nosferatu.lan> (raw)
In-Reply-To: <20050418102332.A21081@flint.arm.linux.org.uk>
[-- Attachment #1: Type: text/plain, Size: 3598 bytes --]
On Mon, 2005-04-18 at 10:23 +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 test...
>
> > > 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 down to horribly bad interface tools. With
> > BK, we had these nice tools that pointed out that there were files that
> > you might want to commit (ie "bk citool"), and made this very obvious.
> >
> > 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.
>
> Ok, I just tried pulling your tree into the tree you pulled from, and
> got this:
>
> Tree change: e7905b2f22eb5d5308c9122b9c06c2d02473dd4f ee423ea56280512778a5961ee58a785a73acb7d1
> ...
> *100644->100644 blob 46f0a3caae02b4bb8f903d7ac86456aa0c37954b->ba4afd7956173b6f89eb6b0b9ad23b392d5c0aee arch/arm/kernel/process.c
> *100644->100644 blob 4a36fa7192e11df36f5e0928b064239dabe1e305->ec0bc8f315ab5d78a4220e176e7aee76d52d1c74 arch/arm/kernel/traps.c
> *100644->100644 blob 311d19ee00208faf02359f9e7c5394577a40f253->bf923a953703c6ca0c88eac3b2850cf07b838996 arch/arm/lib/changebit.S
> *100644->100644 blob c07afa31695654e6489ec59c3f837183b325e9da->41f89b3a393d5af939f04f63c5bf4991b2bf6599 arch/arm/lib/clearbit.S
> ...
> Tracked branch, applying changes...
> Merging e7905b2f22eb5d5308c9122b9c06c2d02473dd4f -> ee423ea56280512778a5961ee58a785a73acb7d1
> to df4449813c900973841d0fa5a9e9bc7186956e1e...
> COPYING: needs update
> CREDITS: needs update
> Documentation/00-INDEX: needs update
> Documentation/BK-usage/00-INDEX: needs update
> ...
> patching file arch/arm/kernel/process.c
> Reversed (or previously applied) patch detected! Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to file arch/arm/kernel/process.c.rejpatching file arch/arm/kernel/traps.c
> Reversed (or previously applied) patch detected! Skipping patch.
> 3 out of 3 hunks ignored -- saving rejects to file arch/arm/kernel/traps.c.rej
> patching file arch/arm/lib/changebit.S
> Reversed (or previously applied) patch detected! Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to file arch/arm/lib/changebit.S.rej
> patching file arch/arm/lib/clearbit.S
> Reversed (or previously applied) patch detected! Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to file arch/arm/lib/clearbit.S.rej
>
> so obviously git pull isn't able to indentify what's already in the
> local repository.
>
> Interestingly, the files listed above as having rejects are excluded
> from the list of "needs update". And I don't know why git is staying
> that these files need updating, because they haven't changed since
> they were initially checked out.
>
> This was with some random version of git-pasky-0.04. Unfortunately,
> this version doesn't have the sha1 ID appended, so I couldn't say
> definitively that it's the latest and greatest. It might be a day
> old.
>
gitmerge.sh does not yet have support for the new merge stuff as far as
I know, and if it does, then its a very recent version (ie, one that
have the sha1 ID appended).
--
Martin Schlemmer
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2005-04-18 11:08 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-16 23:01 Re-done kernel archive - real one? Linus Torvalds
2005-04-17 15:24 ` Russell King
2005-04-17 16:28 ` Petr Baudis
2005-04-17 16:36 ` Linus Torvalds
2005-04-17 18:57 ` Russell King
2005-04-17 19:33 ` Linus Torvalds
2005-04-17 19:45 ` Linus Torvalds
2005-04-17 19:51 ` Russell King
2005-04-17 20:08 ` Linus Torvalds
2005-04-17 20:11 ` Russell King
2005-04-17 20:26 ` Linus Torvalds
2005-04-17 20:42 ` Russell King
2005-04-18 22:16 ` Russell King
2005-04-18 22:33 ` Petr Baudis
2005-04-18 23:29 ` Linus Torvalds
2005-04-18 23:53 ` Petr Baudis
2005-04-17 16:05 ` Russell King
2005-04-17 16:44 ` Linus Torvalds
2005-04-17 18:13 ` David A. Wheeler
2005-04-17 18:14 ` Petr Baudis
2005-04-17 18:20 ` Russell King
2005-04-17 18:44 ` David A. Wheeler
2005-04-18 11:15 ` Martin Schlemmer
2005-04-17 20:21 ` H. Peter Anvin
2005-04-17 21:50 ` Jochen Roemling
2005-04-17 22:09 ` Randy.Dunlap
2005-04-17 22:30 ` Petr Baudis
2005-04-17 21:52 ` David Woodhouse
2005-04-17 22:17 ` Linus Torvalds
2005-04-17 22:19 ` Russell King
2005-04-17 22:51 ` Russell King
2005-04-17 23:24 ` Linus Torvalds
2005-04-18 9:23 ` Russell King
2005-04-18 11:14 ` Martin Schlemmer [this message]
2005-04-18 11:15 ` Petr Baudis
2005-04-18 15:23 ` Linus Torvalds
2005-04-18 17:05 ` Linus Torvalds
2005-04-18 18:07 ` Petr Baudis
2005-04-18 21:53 ` Russell King
2005-04-18 22:01 ` Linus Torvalds
2005-04-18 22:48 ` Petr Baudis
2005-04-18 22:59 ` Russell King
2005-04-18 23:09 ` Petr Baudis
2005-04-19 7:27 ` Russell King
2005-04-18 23:31 ` Linus Torvalds
2005-04-18 21:33 ` Russell King
2005-04-18 21:56 ` Linus Torvalds
2005-04-18 14:22 ` Petr Baudis
2005-04-18 15:04 ` Greg KH
2005-04-18 15:25 ` Randy.Dunlap
2005-04-18 15:42 ` Linus Torvalds
2005-04-18 22:05 ` Greg KH
2005-04-18 22:14 ` Greg KH
2005-04-18 23:16 ` Linus Torvalds
2005-04-18 23:26 ` Greg KH
2005-04-18 23:10 ` Linus Torvalds
2005-04-17 22:20 ` H. Peter Anvin
2005-04-17 22:22 ` randy_dunlap
2005-04-17 23:21 ` David Woodhouse
2005-04-18 1:33 ` randy_dunlap
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=1113822890.16288.19.camel@nosferatu.lan \
--to=azarah@nosferatu$(echo .)za.org \
--cc=git@vger$(echo .)kernel.org \
--cc=pasky@ucw$(echo .)cz \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=torvalds@osdl$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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