search

schacon / hg-git

mercurial to git bridge, pushed to directly from the hg-git plugin in Hg
GNU General Public License v2.0
621 stars 71 forks source link

git-hg confused by origin tags? #37

Closed rsc closed 15 years ago

rsc commented 15 years ago

Thanks for writing hg-git.

I imported a Git repository and am trying to push a change back. The tags that have been created seem to be of the form origin/foo, but then hg-git gets surprised that .hg/git/refs/tags/origin is a directory?

$ hg log -l 1
changeset:   555:947726a2c5fc
tag:         tip
tag:         origin/master
parent:      552:eb2ac66a49cc
user:        Russ Cox <rsc@swtch.com>
date:        Sat Jul 11 18:17:32 2009 -0700
summary:     s/IRQ_OFFSET/T_IRQ0/: it's a trap number, not an irq number.

$ hg gpush
fetching from : origin
importing Hg objects into Git
at:   0/556
at: 100/556
at: 200/556
at: 300/556
at: 400/556
at: 500/556
importing Git objects into Hg
at:   0/555
at: 100/555
at: 200/555
at: 300/555
at: 400/555
at: 500/555
pushing to : origin
creating and sending data
    origin::refs/tags/origin => GIT:27ff8f0e
    origin::refs/tags/master => GIT:8b75366c
    origin::refs/tags/symlinks => GIT:9e698c58
abort: Is a directory: /Volumes/Netdisk/rsc/mit/6.828/xv6-hg-git/.hg/git/refs/tags/origin
$ find .hg/git/refs
.hg/git/refs
.hg/git/refs/remotes
.hg/git/refs/remotes/origin
.hg/git/refs/remotes/origin/master
.hg/git/refs/remotes/origin/symlinks
.hg/git/refs/remotes/origin/origin
.hg/git/refs/tags
.hg/git/refs/tags/REV0
.hg/git/refs/tags/xv6-2007
.hg/git/refs/tags/xv6-2008
.hg/git/refs/tags/symlinks
.hg/git/refs/tags/origin
.hg/git/refs/tags/origin/master
.hg/git/refs/tags/origin/symlinks
.hg/git/refs/tags/origin/origin
.hg/git/refs/heads
.hg/git/refs/heads/master
$
rsc commented 15 years ago

http://bitbucket.org/abderrahim/hg-git/ seems to fix this