Re: [PATCH 5/5] rebase [-m]: calculate patches in upstream correctly

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 26, 2012, 21:13 UTC
Message-ID: <7v8vf9bwv0.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1340722318-24392-6-git-send-email-martin.von.zweigbergk@gmail.com>

Hrm, why does this break 9140.6? Has the test been expecting a wrong result?

-- >8 --

expecting success: 
        ( cd g &&
          git svn fetch &&
          git svn rebase &&
          fgrep "mod hidden" hid/hid.txt
        )

Index mismatch: a4b5c203f79112e92d530cb82366ca4d706fa4a8 != 6b5a1244749c8cdb5442eefd0abc3689d666322d
rereading 6f980d1f3188db5082d5bfd2f28b317b6e7b8893
        A       hid/hid.txt
r2 = 9c02870abb807d33b84cc36ab2f2384bf01448f8 (refs/remotes/git-svn)
        M       vis/vis.txt
r3 = 26a2abacc1ca26dde5a0b18a73f0b2d306dc95d1 (refs/remotes/git-svn)
        M       hid/hid.txt
r4 = 9299b4c6227b8efcc64ec5e867f0eeae4d1c96ec (refs/remotes/git-svn)
First, rewinding head to replay your work on top of it...
Applying: create initially hidden files
fatal: unrecognized input
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 create initially hidden files

When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To check out the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/git-svn: command returned error: 1

not ok - 6 refetch succeeds not ignoring any files