Hg merge fix #173
Closed
Hg merge fix #173
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some tests created a `temp/` directory in the repo root before this patch. It doesn't seem that any tests need to test with a particular output root, so I just moved the existing calls to `setup()`.
…gOriginTest
I think it's clearer that `origin.resolve("1")` resolves to a commit
called "two", so I've renamed the commits to start from "zero" instead
of "one".
Consider this history (later commits higher up): ``` D new import target |\ | C new feature | | B | old import target |/ A ``` Before this CL, when Copybara tries to import that from Mercurial, it looks at the commits in Mercurial revset "B::D", which contains only B and D. It will therefore miss commit C. IIUC, some later processing also makes it skip the merge commit D, so it doesn't end up importing anything. Well, it actually does seem to import B again, but that's also doesn't seem desirable. Googlers can see my pending cl/372950711 for an example (at the time of mailing this CL). That CL should have gotten the state in commit fde5bb5d1acf imported. Instead, it sees no content changes and lists the already imported commit 48637f926817 in the CL description. I've updated the test case now that `HgOrigin.changes()` no longer includes the `fromRef` value. I have not added a test case for the merge issue becase I'm not familiar with the test setup. Let me know if you'd like to me add a test case for that.
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes an issue with importing merge commits from Mercurial.