Re: Question about git revert

On Thursday 08 July 2010 03:50:19 Hal Eisen wrote:

I did a search of the archives for this mailing list, and couldn't
find anything applicable.

I am having the same problem as Joshua Cheek.  He asked this question
on StackOverflow about a month ago.

http://stackoverflow.com/questions/2938301/git-remove-specific-commit

There are no merges involved.  I would be perfectly happy having
another commit in my history which documents the reverting of a prior
commit.

The problem seems to stem from git-revert not properly calculating the
"cleanness" of the prior commit, and incorrectly thinking that later
commits depend on the to-be-reverted commit.

You may want to try "git revert" with the new --strategy option,
for example "git revert --strategy resolve <commit>". This option is not in a 
released version yet, so you should use one of the last git version from the 
master branch, for example v1.7.2-rc2.

I have seen other web sites which suggest using git to manually
generate a diff, and then applying it as a reverse patch, but that
seems like a kludge.

What is the best solution for this use case?

It depends on how well the revert algorithms work in the case you are 
interested in. If one strategy works quite well, then manually fixing the few 
remaining problems, if any, in the result is probably the best solution. 

Regards,
Christian.