From 5536a1a9c5811c299bb181c77f8fbc71750714f0 Mon Sep 17 00:00:00 2001 From: jochan Date: Tue, 20 Jun 2017 10:53:44 -0700 Subject: [PATCH] Added intro message and fixed list ordering. --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5c899ed..b21a8e4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # Mercurial to Git Migration +These scripts will migrate a Mercurial repository to a Git repository using hg-fast-export, strip large files using BFG Repo-Cleaner, tag and delete branches that were closed in Mercurial, and convert .hgignore files to .gitignore files. ## Notes * If any .sh scripts cannot be executed, replace `./` with `bash ` or execute `chmod u+x <.sh script>`. @@ -10,18 +11,18 @@ * ``: The directory to which the BFG Repo-Cleaner .jar file will be downloaded. ## Instructions -0. Copy all hg2git\*.sh, authors.py, and users.csv files to the same directory. -1. Run `./hg2git.sh `. This may take a while. Do **NOT** delete the reformatted-authors.txt file. -2. If you have new changes in your Mercurial repository and you wish to update your Git repository, ensure the changes have been pulled (`hg pull`) and run `./hg2git_update.sh `. -3. Before moving on, make sure that you are **absolutely sure** you no longer need to update your Git repository from your Mercurial repository. Once you perform the next steps, you **cannot** update again. -4. To strip out large files from history and delete closed branches, run `./hg2git_clean.sh `. Files larger than 40M will be stripped. This may take a while. -5. To copy .hgignore files to .gitignore, convert _some_ of the regex to globs, and commit these files for every branch, run `./hg2git_ignore.sh `. Note that this will convert the repository from bare to non-bare and check out files. -6. Set an upstream (`git remote add origin `) and push the repository (`git push -u origin master`). This may take a while. +1. Copy all hg2git\*.sh, authors.py, and users.csv files to the same directory. +2. Run `./hg2git.sh `. This may take a while. Do **NOT** delete the reformatted-authors.txt file. +3. If you have new changes in your Mercurial repository and you wish to update your Git repository, ensure the changes have been pulled (`hg pull`) and run `./hg2git_update.sh `. +4. Before moving on, make sure that you are **absolutely sure** you no longer need to update your Git repository from your Mercurial repository. Once you perform the next steps, you **cannot** update again. +5. To strip out large files from history and delete closed branches, run `./hg2git_clean.sh `. Files larger than 40M will be stripped. This may take a while. +6. To copy .hgignore files to .gitignore, convert _some_ of the regex to globs, and commit these files for every branch, run `./hg2git_ignore.sh `. Note that this will convert the repository from bare to non-bare and check out files. +7. Set an upstream (`git remote add origin `) and push the repository (`git push -u origin master`). This may take a while. ## TL;DR 1. `./hg2git.sh ` 2. `./hg2git_update.sh ` -3. Read [Instructions](#instructions) > Step 3. +3. Read [Instructions](#instructions) > Step 4. 4. `./hg2git_clean.sh ` 5. `./hg2git_ignore.sh ` 6. `git remote add origin && git push -u origin master`