2002: GitToHgConverter fails on merge with ancestor

[erikj79]

Sometimes through weird circumstances we can end up with Git repositories where merges between a commit and an ancestor to that commit. Converting such a commit to Mercurial can be tricky, and in one case we are currently failing.

The GitToHgConverter is already trying to solve this issue, but only detects the ancestor relationship in one direction between the commits to be merged, and not the other. Specifically if the first parent is an ancestor of the second parent, the conversion will identify the situation and apply the workaround. But, if instead the second parent is an ancestor of first parent, it's not detected. The first case is quite commonly achieved by merging a branch into the current branch using --no-ff, but the second seems rarer. The same workaround should apply fine in both cases however.

To verify this behavior I implemented two new tests, one for each of the possible ancestor relationships. The first test already passed, but the second was fixed by this change.

The FF.Auto case isn't tested, and is unlikely to ever be used, but I believe my change there makes it more correct than it was before.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace

Issue

• SKARA-2002: GitToHgConverter fails on merge with ancestor (Bug - P2)

Reviewers

• Zhao Song (@zhaosongzs - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/skara.git pull/1549/head:pull/1549
$ git checkout pull/1549

Update a local copy of the PR:
$ git checkout pull/1549
$ git pull https://git.openjdk.org/skara.git pull/1549/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1549

View PR using the GUI difftool:
$ git pr show -t 1549

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/skara/pull/1549.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back erikj! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[mlbridge]

Webrevs

• 00: Full (dd200086)

[zhaosongzs]

Looks good!

[openjdk]

@erikj79 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

After integration, the commit message for the final commit will be:

2002: GitToHgConverter fails on merge with ancestor

Reviewed-by: zsong

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[erikj79]

/integrate

[openjdk]

Going to push as commit 67d9f09.

[openjdk]

@erikj79 Pushed as commit 67d9f09.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.