{"thread":{"id":"15573","subject":"failure doing massive revert","startedAt":"2008-09-18T09:09:06Z","lastAt":"2008-09-19T09:35:41Z","messageCount":3,"participants":["Mike Galbraith","Avery Pennarun"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"91015","messageId":"1221728946.8516.14.camel@marge.simson.net","threadId":"15573","inReplyTo":null,"subject":"failure doing massive revert","fromName":"Mike Galbraith","fromEmail":"efault@gmx.de","sentAt":"2008-09-18T09:09:06Z","receivedAt":"2008-09-18T09:09:06Z","isPatch":false,"sender":{"key":"efault@gmx.de","avatar":null},"body":"Greetings,\n\nFor reasons I'd rather not go into, I decided to create a merge free\ntree to try to bisect.  I did this yesterday for a smaller range, and it\nworked fine, and I was able to revert the reverts to re-apply.  Trying\nto revert everything from v2.6.26..today croaked.\n\nfor i in `git rev-list --no-merges v2.6.26..HEAD`; do git revert $i < /dev/null; done\n\nGot this far...\n\nAuthor: Mike Galbraith <efault@gmx.de>  2008-09-18 10:50:58\nCommitter: Mike Galbraith <efault@gmx.de>  2008-09-18 10:50:58\nParent: 6753354a5984745b0121f7853e4e7a392e25adc7 (Revert \"[ARM] 5185/1: Fix spi num_chipselect for lubbock\")\nChild:  0000000000000000000000000000000000000000 (Local uncommitted changes, not checked in to index)\nBranch: master\nFollows: v2.6.27-rc6\nPrecedes: \n\n    Revert \"pktgen: multiqueue etc.\"\n    \n    This reverts commit e6fce5b916cd7f7f79b2b3e53ba74bbfc1d7cf8b.\n\n...then began spewing fatal: Dirty index: cannot revert.  Probably me\nbeing git-ignorant, but figured I'd mention it just in case.  I started\nby whacking all source, followed by checkout -f master, so have no idea\nwhat git means by local changes.\n\n\t-Mike\n"},{"id":"91065","messageId":"32541b130809181126v4ba4acd7pc5bda085740ab6ba@mail.gmail.com","threadId":"15573","inReplyTo":"1221728946.8516.14.camel@marge.simson.net","subject":"Re: failure doing massive revert","fromName":"Avery Pennarun","fromEmail":"apenwarr@gmail.com","sentAt":"2008-09-18T18:26:59Z","receivedAt":"2008-09-18T18:26:59Z","isPatch":false,"sender":{"key":"apenwarr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/20592?v=4"},"body":"On Thu, Sep 18, 2008 at 5:09 AM, Mike Galbraith <efault@gmx.de> wrote:\n> For reasons I'd rather not go into, I decided to create a merge free\n> tree to try to bisect.  I did this yesterday for a smaller range, and it\n> worked fine, and I was able to revert the reverts to re-apply.  Trying\n> to revert everything from v2.6.26..today croaked.\n>\n> for i in `git rev-list --no-merges v2.6.26..HEAD`; do git revert $i < /dev/null; done\n\nHmm, I don't think you can revert every single patch on a merged tree\nthat way for the same reason you can't just rebase it: history wasn't\nlinear.\n\nI think something involving 'git rev-list --first-parent' and some\nvariant of \"git diff $i $i^ | git apply\" might work better, as it\nwould inherently squash merge commits, thus making them linearly\nreversible (although throwing away large parts of history).\n\nThrowing away history might not be what you want, but then again,\nmaybe it is.  It's the only way I know of to 100% reliably linearize\nthe history, anyway.\n\nAlso, if you use \"&& done\" instead of \"; done\" then it'll abort right\naway when it has a problem.\n\nHave fun,\n\nAvery\n"},{"id":"91100","messageId":"1221816941.4914.145.camel@marge.simson.net","threadId":"15573","inReplyTo":"32541b130809181126v4ba4acd7pc5bda085740ab6ba@mail.gmail.com","subject":"Re: failure doing massive revert","fromName":"Mike Galbraith","fromEmail":"efault@gmx.de","sentAt":"2008-09-19T09:35:41Z","receivedAt":"2008-09-19T09:35:41Z","isPatch":false,"sender":{"key":"efault@gmx.de","avatar":null},"body":"On Thu, 2008-09-18 at 14:26 -0400, Avery Pennarun wrote:\n> On Thu, Sep 18, 2008 at 5:09 AM, Mike Galbraith <efault@gmx.de> wrote:\n> > For reasons I'd rather not go into, I decided to create a merge free\n> > tree to try to bisect.  I did this yesterday for a smaller range, and it\n> > worked fine, and I was able to revert the reverts to re-apply.  Trying\n> > to revert everything from v2.6.26..today croaked.\n> >\n> > for i in `git rev-list --no-merges v2.6.26..HEAD`; do git revert $i < /dev/null; done\n> \n> Hmm, I don't think you can revert every single patch on a merged tree\n> that way for the same reason you can't just rebase it: history wasn't\n> linear.\n\nOk, nothing is broke, I just tripped over my white git-fu belt.\n\n> I think something involving 'git rev-list --first-parent' and some\n> variant of \"git diff $i $i^ | git apply\" might work better, as it\n> would inherently squash merge commits, thus making them linearly\n> reversible (although throwing away large parts of history).\n> \n> Throwing away history might not be what you want, but then again,\n> maybe it is.  It's the only way I know of to 100% reliably linearize\n> the history, anyway.\n\nThanks, I'll save this reply in case I decide to resume hunt.\n\n\t-Mike \n"}]}