git svn dcommit error ?

[Geert Janssens]

On zaterdag 21 mei 2011, John Ralls wrote:
> On May 21, 2011, at 8:29 AM, Geert Janssens wrote:
> > On zaterdag 21 mei 2011, John Ralls wrote:
> >> Take a look at `git log --full-history A'..B
> >> src/gnome-utils/assistant-utils.c` (filling in the actual commit short
> >> hashes for A' and B, of course). It should show what git thinks are the
> >> differences.
> > 
> > $ git log --full-history c46431964..gtk2.18
> > src/gnome-utils/assistant-utils.c commit
> > b0d4b0c75fcb7f91ad60e68a1939c844e8333602
> > Author: Geert Janssens <janssens-geert at telenet.be>
> > Date:   Fri May 20 16:31:42 2011 +0000
> > 
> >    Replace obsolete gnome include with gtk include
> >    
> >    git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20665
> > 
> > 57a11ea4-9604-0410-9ed3-97b8803252fd
> > 
> > This commit is commit A in my diagram above and is pushed to svn as
> > revision 20665.
> 
> OK. A bit of googling takes me to [1], which is part of what taught me how
> to set this up.
> 
> There, I'm reminded that the problem is likely that your git reference to
> SVN is outdated because of the round-trip from your repo to svn to github
> (via my server). Running git-update should patch up the references so that
> your dcommit will work.
> 
I wish that were so:

$ git-update
warning: refname 'trunk' is ambiguous.
Current branch trunk is up to date.

$ git checkout gtk2.18
Switched to branch 'gtk2.18'

$ git svn dcommit
Committing to svn+ssh://gjanssens@svn.gnucash.org/repo/gnucash/trunk ...
        M       src/gnome-utils/assistant-utils.c
Transaction is out of date: File '/gnucash/trunk/src/gnome-utils/assistant-
utils.c' is out of date at /usr/libexec/git-core/git-svn line 576

I'm afraid I don't understand this well enough to know what to do next. I read 
the link you referred to, but other than what you proposed there seems nothing 
in there that could help.

Geert