Git development
 help / color / mirror / Atom feed
From: Anton Korobeynikov <asl@math.spbu.ru>
To: git@vger.kernel.org
Subject: How to fix this error
Date: Wed, 05 Dec 2007 15:04:02 +0300	[thread overview]
Message-ID: <1196856242.10880.8.camel@asl.dorms.spbu.ru> (raw)

Hello, Everyone

Today I discovered, that one of my git-svn-pulled trees cannot sync
anymore:

$ git-svn rebase -A ../authors 
Index mismatch: cc94b590c0a458a610fca10fa01e7461c627b63b !=
09ac82e1a756c11865eca3e23c5704f73dc45244
rereading dc25ba706a6edaa0cc51dd376952b694559137c0
        D       test/Sema/undecl-objc-h.m
        M       Basic/FileManager.cpp
        M       Basic/SourceManager.cpp
        M       include/clang/Basic/FileManager.h
        M       include/clang/Basic/SourceManager.h
        M       include/clang/AST/Expr.h
        M       Sema/SemaChecking.cpp
        M       Sema/SemaType.cpp
        M       Sema/Sema.h
        M       Sema/SemaDecl.cpp
        M       Sema/SemaStmt.cpp
        M       Driver/Targets.cpp
        M       Driver/RewriteTest.cpp
Last fetched revision of refs/remotes/git-svn was r44583, but we are
about to fetch: r44571!

Maybe the actual reason were some fs transactions being rollbacked after
power loss, but I'm not sure. Any idea how this can be fixed without
repulling everything from scratch?

Thanks in advance.

-- 
With best regards, Anton Korobeynikov.

Faculty of Mathematics & Mechanics, Saint Petersburg State University.

                 reply	other threads:[~2007-12-05 12:04 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1196856242.10880.8.camel@asl.dorms.spbu.ru \
    --to=asl@math.spbu.ru \
    --cc=git@vger.kernel.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