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

push does nothing #61

Closed bos closed 14 years ago

bos commented 14 years ago

Every time I try a push from a local repo, I get this output:

$ hg push
pushing to git+ssh://git@github.com:bos/event.git
importing Hg objects into Git
creating and sending data
    default::refs/heads/master => GIT:7b56b42d

I've no idea what that output means, but in practice the changesets never seem to show up on the server.

abderrahim commented 14 years ago

Let me guess, you have bookmarks.track.current set to true? if it's the case, you need to explicitly update to master before committing. mercurial updates to default, I see a way to fix this with 1.4.

(in short make sure the "master" bookmark is on the right rev before pushing.) the output you see is also buggy, it should show only the updated refs.

rdw commented 14 years ago

I've got the same problem. My output looks like:

$ hg push git+ssh://git@github.com:rdw/Eventlet.git
pushing to git+ssh://git@github.com:rdw/Eventlet.git
importing Hg objects into Git
creating and sending data

I don't have any bookmarks settings at all; I don't even have the bookmarks extension enabled in my .hgrc. Moving the 'master' tag around doesn't seem to do anything.

rdw commented 14 years ago

I should add that this is after I've done my initial push to the repo; I'm just trying to get some changes up there.

abderrahim commented 14 years ago

I'm not sure about moving the master tag, it should work (how are you doing? hg tag -fl -r tip master), but you should definitely enable the bookmarks extension. pushing without the bookmarks extension enabled hasn't been well tested recently.

rdw commented 14 years ago

It behaves the same whether or not I have the bookmarks extension enabled. No difference that I can tell. I've deleted the repo and started from scratch, even, just in case it was the initial meta-information generation that needed the bookmarks module.

I've moved the master tag around with normal "hg tag" in the past, which sucks to be sure. I just tried a local tag, and the same thing happened.

It's entirely possible that there's something particular to this repository -- its long history has given it its fair share of weirdnesses. I appreciate the effort you're putting into hg-git as a tool, and would love for it to work well in this case. Could you perhaps take a look at the original hg repository and see whether you can reproduce? It can be found at http://bitbucket.org/which_linden/eventlet

durin42 commented 14 years ago

You need to use bookmarks specifically - local tags probably get converted to refs in refs/tags, while bookmarks go to refs/heads. If you want more debugging on this, I'd be happy to help via email - just shoot a message over to the hg-git Google Group.