Re: Fwd: git-svn dcommit fail

From: Kees-Jan Dijkzeul <k.j.dijkzeul@gmail.com>
Date: Jul 5, 2007, 11:06 UTC
Message-ID: <fa0b6e200707050406i831816co80ff1500dae6bf54@mail.gmail.com>
In-Reply-To: <7v1wfndyow.fsf@assigned-by-dhcp.cox.net>

On 7/5/07, Junio C Hamano <gitster@pobox.com> wrote:

> Could you double check?

*Blush*. I should have caught that one myself. I'm now at commit 114fd812f78ea375ee6782d4ff0203f3ae20b076, which still exhibits the same problem.

Basically, the problem is as follows: My head commit is a merge:
$ git show HEAD
commit e135f26dbae66f539b486646a12aa51e71c196a1
Merge: bb8ac98... f453e1e...

Both parents are svn-commits.

When I do a dry-run, I get $ git-svn dcommit -n diff-tree e135f26dbae66f539b486646a12aa51e71c196a1~1 e135f26dbae66f539b486646a12aa51e71c196a1

As far as I'm concerned, this is correct. This is the delta that should be committed to the svn branch who's head is e135f26dbae66f539b486646a12aa51e71c196a1~1 (obviously).

However, function "working_head_info" of git-svn returns the other parent as the working head. As a result, committing the diff to svn fails.

I've observed that the call to cmt_metadata("$d~1") (line 382 of git-svn) does return the correct svn branch, so it would seem to me that it makes much more sense to commit to that.

Any thoughts, tips, tricks?

Thanks!

Kees-Jan