New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow to push merge commits #20

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

Comments

Projects
None yet
3 participants
@glandium
Owner

glandium commented Feb 11, 2015

No description provided.

@glandium glandium added this to the 0.3.0 milestone Feb 11, 2015

@glandium glandium modified the milestones: 0.3.0, 0.4.0 Apr 4, 2015

@glandium glandium modified the milestones: 0.4.0, 0.3.0 Jan 5, 2016

@glandium glandium modified the milestones: 0.5.0, 0.4.0 Apr 15, 2016

@jwkblades

This comment has been minimized.

Show comment
Hide comment
@jwkblades

jwkblades Nov 10, 2016

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

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

@marshallmcmullen

This comment has been minimized.

Show comment
Hide comment
@marshallmcmullen

marshallmcmullen Nov 10, 2016

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??

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

This comment has been minimized.

Show comment
Hide comment
@glandium

glandium Nov 28, 2016

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 (...).

Owner

glandium commented Nov 28, 2016

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

This comment has been minimized.

Show comment
Hide comment
@glandium

glandium Nov 28, 2016

Owner

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

Owner

glandium commented Nov 28, 2016

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

@marshallmcmullen

This comment has been minimized.

Show comment
Hide comment
@marshallmcmullen

marshallmcmullen Nov 28, 2016

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.

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

This comment has been minimized.

Show comment
Hide comment
@glandium

glandium Nov 29, 2016

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.

Owner

glandium commented Nov 29, 2016

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

This comment has been minimized.

Show comment
Hide comment
@marshallmcmullen

marshallmcmullen Nov 29, 2016

@glandium

This comment has been minimized.

Show comment
Hide comment
@glandium

glandium Nov 29, 2016

Owner

Yes. Thanks for confirming.

Owner

glandium commented Nov 29, 2016

Yes. Thanks for confirming.

@glandium glandium modified the milestones: 0.5.0, 0.6.0 Jul 6, 2018

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