Skip to content
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

git-hg seems don't respect the order of a merge #41

Open
weynhamz opened this issue Jan 1, 2014 · 1 comment
Open

git-hg seems don't respect the order of a merge #41

weynhamz opened this issue Jan 1, 2014 · 1 comment

Comments

@weynhamz
Copy link

weynhamz commented Jan 1, 2014

In Git, usually, the first parent of a merge is the branch which other branches merged into.

I have tried your git-hg and abourget's git-hg-again both on mutt's hg repo, it seems that the later respects the order of a merge well, the former is a bit random. You can see from the screenshots below.

  • A merge history graph of mutt imported by your git-hg:

enter image description here

enter image description here

  • The actuall history graph plotted by hgk on mutt's hg repository:

enter image description here

As you can see from the above, the second graph by abourget's git-hg-again is very close to the original hgk graph and is actually reflecting the real workflow of the mutt.

This is also posted as an answer to this question.

@cosmin
Copy link
Owner

cosmin commented Jan 6, 2014

This is interesting. git-hg is really a thin layer of convenience on top of http://github.com/frej/fast-export, although the version I was using was a little over 1 year old at this point. I just updated to the latest version and I'm curious if this fixes the issue. Otherwise it should probably be reported as an issue on fast-export.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants