Allow to push merge commits #20

Open
glandium opened this Issue Feb 11, 2015 · 8 comments

Projects

None yet

3 participants

@glandium
Owner

No description provided.

@glandium glandium added this to the 0.3.0 milestone Feb 11, 2015
@glandium glandium modified the milestone: 0.3.0, 0.4.0 Apr 4, 2015
@glandium glandium modified the milestone: 0.4.0, 0.3.0 Jan 5, 2016
@glandium glandium modified the milestone: 0.5.0, 0.4.0 Apr 15, 2016
@jwkblades

Is this being actively worked? This tool is amazing, but not being able to push merges is a significant limitation.

@marshallmcmullen

Holy smokes, I agree with @jwkblades. I've been using this tool for the last few days and it is by far and above the most amazing thing in the world. So much better than git-remote-hg. But not being able to push merges is definitely a deal breaker. Are there any workarounds until this gets implemented??

@glandium
Owner

Commit 142a72e adds experimental (and slow) support for pushing merges. It /should/ be generating merges mercurial will be happy with, but, at the very least, it doesn't properly handle file renames happening on one of the branches.
So, if you do use this, please use with extra care.
Pushing merges can be enabled by invoking git -c cinnabar.experiments=merge push (...).

@glandium
Owner

Also, both parents of a merge commit need to have been pushed first for this to work.

@marshallmcmullen

This is fantastic!! Thanks so much for getting experimental support for this enabled. I was able to test this out on our hg server and it worked without any problems.

@glandium
Owner

I was able to test this out on our hg server and it worked without any problems.

This is actually surprising. Some further testing showed that storing the metadata fails with AttributeError: delta_node. And there's currently no right value to put in delta_node that makes the result sane.

You can pull the merge from the server to have cinnabar aware of the metadata it created itself, but you should be getting an exception when pushing.

@marshallmcmullen
@glandium
Owner

Yes. Thanks for confirming.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment