RE: recovering from "unordered stage entries in index" error

From: McHenry, Matt <mmchenry@carnegielearning.com>
Date: May 22, 2015, 18:56 UTC
Message-ID: <D377A9280DB18546A2471214D5CBB0E9087568F47B@exchdb01>
In-Reply-To: <CACsJy8Bdx5tto0w1q7rZ1ORx8RmHZCEKPyBqYs37k=YvbO3kzA@mail.gmail.com>

Show 6 quoted lines

> > Isn't this failure coming from git-svn that tries to write out a
> > tree after it prepared whatever it wants to record in its (possibly
> > temporary) index?  I have a feeling that the index held by the end
> > user is not broken.
> 
> Ahh that would explain why ls-files works. Yep.

	I created a copy of this repo + wc via rsync and tried a couple of things.  'git svn rebase -l' worked fine, but didn't fix the error.  Next, reset:

$ git svn log --limit=1 | grep ^r r231655 | avuong | 2015-05-10 10:32:16 -0400 (Sun, 10 May 2015) | 2 lines

$ git svn reset -r 231655 -p r231653 = 13a7f6d6a3f3e44ed1c8523b1a63d72fc4f0ddb9 (refs/remotes/trunk)

$ git svn fetch fatal: unordered stage entries in index write-tree: command returned error: 128

	So it doesn't seem to be specific to the revision being fetched.  I could do a more drastic 'git svn reset', but as you can see I've already fetched a lot of revs, so I'd rather avoid re-fetching if possible.

	Thanks for your help so far -- any other ideas (or requests for further debugging info) are appreciated!