git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Samuel Rossille <samuel.rossille@gmail.com>
To: git@vger.kernel.org
Cc: Samuel <samuel.rossille@gmail.com>
Subject: [git-svn] [bug report] Index in strange state after git svn rebase
Date: Tue, 6 Nov 2012 15:37:58 -0500	[thread overview]
Message-ID: <CANMyAQmJuRpwj67Bwzz1LmoChKVhOjCFOc0mqBHYsc_oQLx0uw@mail.gmail.com> (raw)

Hi Everybody,

Please Cc: me, I am not subscribed

I'm encountering an issue with "git svn rebase". Included in this
email is a summary of the issue, and it is fully detailed in this
stackoverflow question:
http://stackoverflow.com/questions/13183534/why-does-git-rebase-leave-opposite-sets-of-modifications-in-the-stage-and-the

I and several other people think it's a bug, but I could not find any
reference to it in the mailing list archive.

Some people have the same issue with the same svn repository, which is
quite large.

Unfortunately I have not been able to reproduce it completely from
scratch with a new svn repository. I seems to happen only on large
repository with a lot of history, branches, and files.

Here is the summary:

*What I wanted to do:*

In a branch tracking an svn remote, fetch team's content and rebase my
commit after them.


*What I did:*

Git version: "git version 1.7.10.msysgit.1"
With a clean working copy and empty index, I typed: "git svn rebase"


*What I expected:*

Fetch a couple of commits, then a successful rebase, with at the end
an empty index, and a clean working copy.


*What actually happened:*

Fetch a couple of commits, then a successful rebase, with at the end
an index containing modification that revert my commit, and a working
copy containing the expected content ("the revert of the revert")


Please feel free to contact me directly or via the SO question for any
useful additional information.

Thanks,
Samuel Rossille

                 reply	other threads:[~2012-11-06 20:38 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=CANMyAQmJuRpwj67Bwzz1LmoChKVhOjCFOc0mqBHYsc_oQLx0uw@mail.gmail.com \
    --to=samuel.rossille@gmail.com \
    --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;
as well as URLs for NNTP newsgroup(s).