8000 Update Ch9 section about Mercurial imports to match current hg-fast-export release by frej · Pull Request #1027 · progit/progit2 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Update Ch9 section about Mercurial imports to match current hg-fast-export release #1027

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

Merged
merged 3 commits into from
Mar 27, 2018
Merged

Update Ch9 section about Mercurial imports to match current hg-fast-export release #1027

merged 3 commits into from
Mar 27, 2018

Conversation

frej
Copy link
Contributor
@frej frej commented Mar 27, 2018

As maintainer of hg-fast-export I have received at least one issue (frej/fast-export#116) due to the example in Ch9 no longer working with a recent hg-fast-export. In order to avoid future user confusion I propose the changes in this pull request.

The canonical location for the hg-fast-export tool has been on gihub
since 2011.
Hg-fast-export lets us fix this by adding `={new name and email address}` at the end of every line we want to change, and removing the lines for any usernames that we want to leave alone.
If all the usernames look fine, we won't need this file at all.
In this example, we want our file to look like this:
In this example, the same person (Bob) has created changesets under four different names, one of which actually looks correct, and one of which would be completely invalid for a Git commit. Hg-fast-export lets us fix this by turning each line into a rule: `"<input>"="<output>"`, mapping an `<input>` to an `<output>`. Inside the `<input>` and `<output>` strings, all escape sequences understood by the python `string_escape` encoding are supported. If the author mapping file does not contain a matching `<input>`, that author will be sent on to Git unmodified. If all the usernames look fine, we won't need this file at all. In this example, we want our file to look like this:

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please maintain the formating of one sentence per line.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed and revised patch series pushed.

frej added 2 commits March 27, 2018 14:27
Version 171002 of hg-fast-export changed the format of mapping files
to allow arbitrary strings as input and output. Therefore update the
example and the description of the format to avoid user
confusion (frej/fast-export#116).
8000
Users frequently submit summarily rejected patches doing some magit
branch and tag name munging to the hg-fast-export project instead of
using a mapping file. Try to prevent wasted work by mentioning the
existence of mapping files for branches and tags when author mapping
files are covered.
Copy link
Member
@ben ben left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✨ Thanks!

@ben ben merged commit 54bf454 into progit:master Mar 27, 2018
@frej frej deleted the update-hg-fast-export-info branch March 27, 2018 15:45
@jnavila jnavila added the translation backport Tags a PR for translators to backport in their own repo label Mar 27, 2018
jnavila added a commit to progit/progit2-fr that referenced this pull request Oct 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
translation backport Tags a PR for translators to backport in their own repo
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0