commit-queue/bugzilla-tool can get wedged if git is mid-rebase --force-clean should also do a git rebase --abort it seems. It seems that I cannot create a rebase-apply directory, and I wonder if you are in the middle of patch application or another rebase. If that is not the case, please rm -fr /Users/eseidel/Projects/WebKit2/.git/rebase-apply and run me again. I am stopping in case you still have something valuable there. rebase refs/remotes/trunk: command returned error: 1
I like how git talks in the first person.
Created attachment 35079 [details] Testing this local change for now
git rebase --abort isn't better here? rm -rf is scary.
I could use "git rebase --abort". But it prints "No rebase in progress?" and exits "1" if there is no rebase in progress. There doesn't seem to be a way to detect if a rebase is in progress. I guess I could check for the existance of that file. Not sure yet.
Created attachment 35163 [details] Patch v1
Comment on attachment 35163 [details] Patch v1 Looks good. Too bad there isn't a better way to tell if a rebase is in progress.
Comment on attachment 35163 [details] Patch v1 You should always feel free to mark my patches cq+. I'll mark them cq- if needed.
I was worried about the improper ChangeLog diff, but maybe you've fixed that bug.
Ah. Well, I guess we'll see.. I think if anything it will get rejected. svn-apply should be smart enough I think.
Comment on attachment 35163 [details] Patch v1 Clearing flags on attachment: 35163 Committed r47540: <http://trac.webkit.org/changeset/47540>
All reviewed patches have been landed. Closing bug.