From: Christian Kujau <evil@g-house.de>
To: Stelian Pop <stelian@popies.net>
Cc: Ed Tomlinson <tomlins@cam.org>, Meelis Roos <mroos@linux.ee>,
Linux Kernel list <linux-kernel@vger.kernel.org>
Subject: Re: GIT tree broken? (rsync depreciated)
Date: Thu, 14 Jul 2005 13:55:15 +0200 [thread overview]
Message-ID: <42D652A3.50505@g-house.de> (raw)
In-Reply-To: <1120825225.4689.13.camel@localhost.localdomain>
Stelian Pop schrieb:
> After resyncing cogito to the latest version (which incorporates the
> 'pack' changes, which were causing the failure), it does indeed work
> again, when using rsync.
>
hm, i haven't updated my git-tree (linux-2.6.git) for a while and i got
similiar error messages. i updated cogito to:
% cg-version
cogito-0.12.1 (cbec08d191d36126ddaf021961cc8995794b4a72)
and the "cannot map sha1 file..." errors went away. now i get:
Applying changes...
error: Could not read 043d051615aa5da09a7e44f1edbb69798458e067
error: Could not read 043d051615aa5da09a7e44f1edbb69798458e067
error: Could not read c101f3136cc98a003d0d16be6fab7d0d950581a6
error: Could not read c101f3136cc98a003d0d16be6fab7d0d950581a6
error: Could not read c101f3136cc98a003d0d16be6fab7d0d950581a6
error: Could not read a18bcb7450840f07a772a45229de4811d930f461
Merging 99f95e5286df2f69edab8a04c7080d986ee4233b ->
514fd7fd01d378a7b5584c657d9807fc28f22079
to 62351cc38d3eaf3de0327054dd6ebc039f4da80d...
fatal: failed to unpack tree object bda3910b7737a4fac464792657ffedcba185d799
cg-merge: git-read-tree failed (merge likely blocked by local changes)
i *think* i did not make any local changes, but if i did - i want to get
rid ofthem and want a clean tree.
cg-status prints a lot of files with a "D" in front of it but "cg-status
-h" does not know about the "D" status flag....
any hints for this one?
thank you,
Christian.
--
BOFH excuse #378:
Operators killed by year 2000 bug bite.
next prev parent reply other threads:[~2005-07-14 11:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-08 9:30 GIT tree broken? Meelis Roos
2005-07-08 10:00 ` Stelian Pop
2005-07-08 10:18 ` Andrew Morton
2005-07-08 10:27 ` Stelian Pop
2005-07-08 11:28 ` GIT tree broken? (rsync depreciated) Ed Tomlinson
2005-07-08 12:20 ` Stelian Pop
2005-07-14 11:55 ` Christian Kujau [this message]
[not found] <fa.h62oivg.r7ariq@ifi.uio.no>
[not found] ` <fa.lbn9c09.1m18e9l@ifi.uio.no>
2005-07-08 14:38 ` walt
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=42D652A3.50505@g-house.de \
--to=evil@g-house.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mroos@linux.ee \
--cc=stelian@popies.net \
--cc=tomlins@cam.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