[mythtv] GIT reverts accidentally committed

[Lennart Sorensen]

On Wed, Feb 22, 2012 at 04:38:48PM -0500, Daniel Kristjansson wrote:
> Yeah, anyone that pulled the bad change has to manually repair their
> repo. The proper thing to do is to just reverse all the changes. As
> you found out git revert has problems if there is a merge involved
> because it doesn't know which parent tree is 'trunk'; but it is still
> possible to create a patch manually. (There is probably some git magic
> to tell revert what to do, but I don't know it.)

I believe reverting the merge commit works.  It isn't completely obvious
though that one should do that.

> As a rule you should only get rid of commits completely while they
> are still only in your local tree. After that you want to commit
> something new to do undo the damage.

-- 
Len Sorensen