Page MenuHomePhabricator

[tools] [llvm-nm] Revert rL365889
AbandonedPublic

Authored by abrachet on Jul 16 2019, 6:46 AM.

Details

Summary

git llvm revert rL365889 didn't work, so just doing it by hand.

Diff Detail

Event Timeline

abrachet created this revision.Jul 16 2019, 6:46 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 16 2019, 6:46 AM

What about it didn't work? Should it have been git llvm revert r365889? If that doesn't work, have you tried the other options described at https://llvm.org/docs/GettingStarted.html#reverting-a-change-when-using-git?

Yes I tried those. It says

`git log --format=%H --grep '^llvm-svn: 365889$' 'HEAD~10000...HEAD'` returned 128
fatal: ambiguous argument 'HEAD~10000...HEAD': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'

I think because I deleted that branch already so it isn't local? I'm not really sure, truthfully.

I don't think it's anything to do with your local branch. You should be on an up-to-date master to run it, I think. If that doesn't work, post on the mailing list about it, because it should. Don't just do it by hand.

abrachet abandoned this revision.Jul 16 2019, 8:37 AM

I got it to work. The revert is here rL366219. I think it didn't work because I always clone with --depth 1? So I just created a fresh clone.

I got it to work. The revert is here rL366219. I think it didn't work because I always clone with --depth 1? So I just created a fresh clone.

Yes, git llvm revert is ultimately a wrapper around git revert <git commit that git llvm finds>, so if you don't have the commit in your history (with --depth 1 you won't have anything), it won't work.
Certainly we could make it print a better error message, and also handle other call signs (rLNNNNNN, rCNNNNNN, rLLDNNNNNN, etc.)