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

8: Use a file based approach for GitToHgConverter.java #110

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Aug 30, 2019

Hi,

this patch introduces a file based approach for GitToHgConverter (instead of interpreting diffs). This is much more stable solution, we do not have to handle different encodings etc. Successfully converted the jfx repo from git to hg (and a bunch of smaller ones like jmc, code-tools/*, etc).

Thanks,
Erik

Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Approvers

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 30, 2019

👋 Welcome back ehelin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).

@openjdk openjdk bot added the rfr label Aug 30, 2019
@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 30, 2019

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk openjdk bot removed the rfr label Aug 30, 2019
@openjdk
Copy link

@openjdk openjdk bot commented Aug 30, 2019

@edvbld This change can now be integrated. The commit message will be:

8: Use a file based approach for GitToHgConverter.java

Reviewed-by: rwestberg
  • If you would like to add a summary, use the /summary command.
  • To list additional contributors, use the /contributor command.

Since the source branch of this PR was last updated there have been 4 commits pushed to the master branch:

  • a2d8107: 8: Use a file based approach for GitToHgConverter.java
  • bb34b1d: Add merge and topological bots to cli image
  • cbe145f: Make sure Commits are closed when using Commits::stream
  • 8501faf: Add topological merge bot

Your changes cannot be rebased automatically without conflicts, so you will need to merge master into your branch before integrating.

@openjdk openjdk bot added the ready label Aug 30, 2019
@edvbld
Copy link
Member Author

@edvbld edvbld commented Aug 30, 2019

/integrate

@openjdk openjdk bot closed this Aug 30, 2019
@openjdk openjdk bot added the integrated label Aug 30, 2019
@openjdk
Copy link

@openjdk openjdk bot commented Aug 30, 2019

@edvbld The following commits have been pushed to master since your change was applied:

Your commit was automatically rebased without conflicts.
Pushed as commit a2d8107.

@openjdk openjdk bot added the outdated label Aug 30, 2019
@edvbld edvbld deleted the addremove branch Sep 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants