git-svn: revert a commit from a not master branch

Question

Well.. I did some headless committing and merging and now I am deep in the ....

Here's what I did:

1. fetched trunk with git-svn
2. branched off work
3. git commit ed stuff to work
4. git svn dcommit ted the cnanges to svn, (yes, this i where it gets interesting)
5. git checkout master
6. git merge work

In this situation, git doesn't seem to understand that the changes to svn are the same as in itself. It is now up to date, but when I try to

git svn rebase master

I get Invalid upstream

Answer 1

You need to rebase your master branch onto the updated SVN trunk before you attempt to rebase your work branch on master.

For example:

git checkout master
git svn rebase
git checkout work
git rebase master

This ensures that your master branch is in sync with the SVN trunk.

Answer 2

The Solution to this was: Do a hard reset on Master to a common ancestor (svn and master)

svn reset --hard  <somehash>

then I did a rebase.

Now all directions of merges work again, as far as I can tell. I am still a total git newbie...