Hi Eric,
I just updated to the latest git/git-svn (on branch 'master') and the
workflow I've been using no longer seems to work:
# review the commits I'm going to send to svn
ziti:~/proj/bioc-2.0-git seth$ git log remotes/git-svn..HEAD
# now send them
ziti:~/proj/bioc-2.0-git seth$ git svn dcommit remotes/git-svn..HEAD
fatal: ambiguous argument
'refs/remotes/git-svn..remotes/git-svn..HEAD': unknown revision or
path not in the working tree. Use '--' to separate paths from
revisions 32768 at /Users/seth/scm/bin/git-svn line 2190
main::safe_qx('git-rev-list', '--no-merges', 'refs/remotes/git-svn..remotes/git-svn..HEAD') called at /Users/seth/scm/bin/git-svn line 610
main::dcommit('remotes/git-svn..HEAD') called at /Users/seth/scm/bin/git-svn line 197
At this point, my last commit seems to have been reset (although the
changes are thankfully still in my working tree). If this happens to
you, you can recover the last commit like:
git commit -a -v -c ORIG_HEAD
And it seems that the new interface requires no extra args:
git svn dcommit
The new interface seems ok until things like
git svn dcommit remotes/git-svn..HEAD~2
are allowed (if ever). But it would be nice for the failure mode to
not undo commits :-)
+ seth
git version 1.4.4.2.gee60-dirty
(the dirty is a hand edit to Makefile for prefix)
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html