RubyGems - wayfarer - Versions diffs - 0.4.0 → 0.4.4 - Mend

wayfarer 0.4.0 → 0.4.4

Files changed (742) hide show

data/spec/support/static/git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git.html ADDED Viewed

@@ -0,0 +1,1741 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-49925874-3"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+    gtag('config', 'UA-49925874-3');
+  </script>
+  <meta charset='utf-8'>
+  <meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Git - Migrating to Git</title>
+  <link href='../../../favicon.ico' rel='shortcut icon' type='image/x-icon'>
+  <link rel="stylesheet" media="screen" href="../../../assets/application-cafcf280f67db0e6d8168ba98a38da878769a9d5f37793b68ffb963a02d185e0.css" />
+  <script src="../../../assets/modernize-b3ebe0c31c24f230dc62179d3e1030d2e57a53b1668d9382c0a27dbd44a94beb.js"></script>
+  <!--[if (gte IE 6)&(lte IE 8)]>
+  <script src="/javascripts/selectivizr-min.js"></script>
+  <![endif]-->
+</head>
+<body id="documentation">
+  <div class="inner">
+    <header>
+  <a href="https://git-scm.com/"><img src="../../../images/logo@2x.png" width="110" height="46" alt="Git" /></a>
+  <span id="tagline"></span>
+  <script type="text/javascript">
+    var taglines = ["fast-version-control","everything-is-local","distributed-even-if-your-workflow-isnt","local-branching-on-the-cheap","distributed-is-the-new-centralized"];
+    var tagline = taglines[Math.floor(Math.random() * taglines.length)];
+    document.getElementById('tagline').innerHTML = '--' + tagline;
+  </script>
+  <form id="search" action="https://git-scm.com/search/results">
+    <input id="search-text" name="search" placeholder="Search entire site..." autocomplete="off" type="text" />
+  </form>
+  <div id="search-results"></div>
+</header>
+  </div> <!-- .inner -->
+    <div class="inner">
+      <div id="content-wrapper">
+        <button class="sidebar-btn"></button>
+<aside class="sidebar" id="sidebar">
+  <nav>
+    <ul>
+      <li>
+        <a href="https://git-scm.com/about">About</a>
+        <ul class="">
+          <li>
+            <a href="https://git-scm.com/about">Branching and Merging</a>
+          </li>
+          <li>
+            <a href="https://git-scm.com/about/small-and-fast">Small and Fast</a>
+          </li>
+          <li>
+            <a href="https://git-scm.com/about/distributed">Distributed</a>
+          </li>
+          <li>
+            <a href="https://git-scm.com/about/info-assurance">Data Assurance</a>
+          </li>
+          <li>
+            <a href="https://git-scm.com/about/staging-area">Staging Area</a>
+          </li>
+          <li>
+            <a href="https://git-scm.com/about/free-and-open-source">Free and Open Source</a>
+          </li>
+          <li>
+            <a href="https://git-scm.com/about/trademark">Trademark</a>
+          </li>
+        </ul>
+      </li>
+      <li>
+        <a class="active" href="https://git-scm.com/doc">Documentation</a>
+        <ul class="expanded">
+          <li>
+            <a href="https://git-scm.com/docs">Reference</a>
+          </li>
+          <li>
+            <a class="active" href="https://git-scm.com/book">Book</a>
+          </li>
+          <li>
+            <a href="https://git-scm.com/videos">Videos</a>
+          </li>
+          <li>
+            <a href="https://git-scm.com/doc/ext">External Links</a>
+          </li>
+        </ul>
+      </li>
+      <li>
+        <a href="https://git-scm.com/downloads">Downloads</a>
+        <ul class="">
+          <li>
+            <a href="https://git-scm.com/downloads/guis">GUI Clients</a>
+          </li>
+          <li>
+            <a href="https://git-scm.com/downloads/logos">Logos</a>
+          </li>
+        </ul>
+      </li>
+      <li>
+        <a href="https://git-scm.com/community">Community</a>
+      </li>
+    </ul>
+      <hr class="sidebar">
+        <p>
+This book is available in
+  <a href="https://git-scm.com/book/en">English</a>.
+</p>
+<p>
+  Full translation available in
+  <table>
+    <tr><td><a href="https://git-scm.com/book/az">azərbaycan dili</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/bg">български език</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/de">Deutsch</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/es">Español</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/fr">Français</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/gr">Ελληνικά</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/ja">日本語</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/ko">한국어</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/nl">Nederlands</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/ru">Русский</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/sl">Slovenščina</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/tl">Tagalog</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/uk">Українська</a></td></tr>
+    <tr><td><a href="https://git-scm.com/book/zh">简体中文</a>,</td></tr>
+  </table>
+</p>
+<p>
+  Partial translations available in
+  <table>
+    <tr><td><a href="https://git-scm.com/book/cs">Čeština</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/mk">Македонски</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/pl">Polski</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/sr">Српски</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/uz">Ўзбекча</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/zh-tw">繁體中文</a>,</td></tr>
+  </table>
+</p>
+<p>
+  Translations started for
+  <table>
+    <tr><td><a href="https://git-scm.com/book/be">Беларуская</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/fa" dir="rtl">فارسی</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/id">Indonesian</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/it">Italiano</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/ms">Bahasa Melayu</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/pt-br">Português (Brasil)</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/pt-pt">Português (Portugal)</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/sv">Svenska</a>,</td></tr>
+    <tr><td><a href="https://git-scm.com/book/tr">Türkçe</a>.</td></tr>
+  </table>
+</p>
+<hr class="sidebar"/>
+<p>
+The source of this book is <a href="https://github.com/progit/progit2">hosted on GitHub.</a></br>
+Patches, suggestions and comments are welcome.
+</p>
+  </nav>
+</aside>
+        <div id="content">
+<div id='book-chapters'>
+  <a class="dropdown-trigger" id="book-chapters-trigger" data-panel-id="chapters-dropdown" href="ch00/_git_p4.html#">Chapters ▾</a>
+<div class='dropdown-panel' id='chapters-dropdown'>
+  <div class="three-column">
+    <div class='column-left'>
+      <ol class='book-toc'>
+  <li class='chapter'>
+  <h2>1. <a href="ch00/ch01-getting-started.html">Getting Started</a></h2>
+    <ol>
+        <li>
+          1.1
+          <a href="ch00/ch01-getting-started.html" >About Version Control </a>
+        </li>
+        <li>
+          1.2
+          <a href="Getting-Started-A-Short-History-of-Git.html" >A Short History of Git </a>
+        </li>
+        <li>
+          1.3
+          <a href="ch00/what_is_git_section.html" >What is Git? </a>
+        </li>
+        <li>
+          1.4
+          <a href="Getting-Started-The-Command-Line.html" >The Command Line </a>
+        </li>
+        <li>
+          1.5
+          <a href="Getting-Started-Installing-Git.html" >Installing Git </a>
+        </li>
+        <li>
+          1.6
+          <a href="ch00/_editor.html" >First-Time Git Setup </a>
+        </li>
+        <li>
+          1.7
+          <a href="ch00/_git_help.html" >Getting Help </a>
+        </li>
+        <li>
+          1.8
+          <a href="Getting-Started-Summary.html" >Summary </a>
+        </li>
+    </ol>
+  </li>
+  <li class='chapter'>
+  <h2>2. <a href="ch00/_git_cloning.html">Git Basics</a></h2>
+    <ol>
+        <li>
+          2.1
+          <a href="ch00/_git_cloning.html" >Getting a Git Repository </a>
+        </li>
+        <li>
+          2.2
+          <a href="ch00/_git_mv.html" >Recording Changes to the Repository </a>
+        </li>
+        <li>
+          2.3
+          <a href="ch00/_viewing_history.html" >Viewing the Commit History </a>
+        </li>
+        <li>
+          2.4
+          <a href="ch00/_unstaging.html" >Undoing Things </a>
+        </li>
+        <li>
+          2.5
+          <a href="ch00/_remote_repos.html" >Working with Remotes </a>
+        </li>
+        <li>
+          2.6
+          <a href="ch00/_annotated_tags.html" >Tagging </a>
+        </li>
+        <li>
+          2.7
+          <a href="ch00/_git_aliases.html" >Git Aliases </a>
+        </li>
+        <li>
+          2.8
+          <a href="Git-Basics-Summary.html" >Summary </a>
+        </li>
+    </ol>
+  </li>
+  <li class='chapter'>
+  <h2>3. <a href="ch00/_switching_branches.html">Git Branching</a></h2>
+    <ol>
+        <li>
+          3.1
+          <a href="ch00/_switching_branches.html" >Branches in a Nutshell </a>
+        </li>
+        <li>
+          3.2
+          <a href="ch00/_basic_branching.html" >Basic Branching and Merging </a>
+        </li>
+        <li>
+          3.3
+          <a href="ch00/_branch_management.html" >Branch Management </a>
+        </li>
+        <li>
+          3.4
+          <a href="ch00/_topic_branch.html" >Branching Workflows </a>
+        </li>
+        <li>
+          3.5
+          <a href="ch00/_delete_branches.html" >Remote Branches </a>
+        </li>
+        <li>
+          3.6
+          <a href="ch00/_rebase_rebase.html" >Rebasing </a>
+        </li>
+        <li>
+          3.7
+          <a href="Git-Branching-Summary.html" >Summary </a>
+        </li>
+    </ol>
+  </li>
+  <li class='chapter'>
+  <h2>4. <a href="Git-on-the-Server-The-Protocols.html">Git on the Server</a></h2>
+    <ol>
+        <li>
+          4.1
+          <a href="Git-on-the-Server-The-Protocols.html" >The Protocols </a>
+        </li>
+        <li>
+          4.2
+          <a href="ch00/_bare_repo.html" >Getting Git on a Server </a>
+        </li>
+        <li>
+          4.3
+          <a href="ch00/_generate_ssh_key.html" >Generating Your SSH Public Key </a>
+        </li>
+        <li>
+          4.4
+          <a href="ch00/_setting_up_server.html" >Setting Up the Server </a>
+        </li>
+        <li>
+          4.5
+          <a href="Git-on-the-Server-Git-Daemon.html" >Git Daemon </a>
+        </li>
+        <li>
+          4.6
+          <a href="Git-on-the-Server-Smart-HTTP.html" >Smart HTTP </a>
+        </li>
+        <li>
+          4.7
+          <a href="Git-on-the-Server-GitWeb.html" >GitWeb </a>
+        </li>
+        <li>
+          4.8
+          <a href="ch00/_gitlab_groups_section.html" >GitLab </a>
+        </li>
+        <li>
+          4.9
+          <a href="Git-on-the-Server-Third-Party-Hosted-Options.html" >Third Party Hosted Options </a>
+        </li>
+        <li>
+          4.10
+          <a href="Git-on-the-Server-Summary.html" >Summary </a>
+        </li>
+    </ol>
+  </li>
+  <li class='chapter'>
+  <h2>5. <a href="ch00/_integration_manager.html">Distributed Git</a></h2>
+    <ol>
+        <li>
+          5.1
+          <a href="ch00/_integration_manager.html" >Distributed Workflows </a>
+        </li>
+        <li>
+          5.2
+          <a href="ch00/_project_over_email.html" >Contributing to a Project </a>
+        </li>
+        <li>
+          5.3
+          <a href="ch00/_git_am.html" >Maintaining a Project </a>
+        </li>
+        <li>
+          5.4
+          <a href="Distributed-Git-Summary.html" >Summary </a>
+        </li>
+    </ol>
+  </li>
+</ol>
+    </div>
+    <div class='column-middle'>
+      <ol class='book-toc'>
+  <li class='chapter'>
+  <h2>6. <a href="ch00/_personal_avatar.html">GitHub</a></h2>
+    <ol>
+        <li>
+          6.1
+          <a href="ch00/_personal_avatar.html" >Account Setup and Configuration </a>
+        </li>
+        <li>
+          6.2
+          <a href="ch00/_fetch_and_push_on_different_repositories.html" >Contributing to a Project </a>
+        </li>
+        <li>
+          6.3
+          <a href="ch00/_email_notifications.html" >Maintaining a Project </a>
+        </li>
+        <li>
+          6.4
+          <a href="ch00/_team_page.html" >Managing an organization </a>
+        </li>
+        <li>
+          6.5
+          <a href="ch00/_commit_status.html" >Scripting GitHub </a>
+        </li>
+        <li>
+          6.6
+          <a href="GitHub-Summary.html" >Summary </a>
+        </li>
+    </ol>
+  </li>
+  <li class='chapter'>
+  <h2>7. <a href="ch00/_git_reflog.html">Git Tools</a></h2>
+    <ol>
+        <li>
+          7.1
+          <a href="ch00/_git_reflog.html" >Revision Selection </a>
+        </li>
+        <li>
+          7.2
+          <a href="ch00/_interactive_staging.html" >Interactive Staging </a>
+        </li>
+        <li>
+          7.3
+          <a href="ch00/_git_clean.html" >Stashing and Cleaning </a>
+        </li>
+        <li>
+          7.4
+          <a href="ch00/_signing_commits.html" >Signing Your Work </a>
+        </li>
+        <li>
+          7.5
+          <a href="ch00/_git_grep.html" >Searching </a>
+        </li>
+        <li>
+          7.6
+          <a href="ch00/_removing_file_every_commit.html" >Rewriting History </a>
+        </li>
+        <li>
+          7.7
+          <a href="ch00/_the_index.html" >Reset Demystified </a>
+        </li>
+        <li>
+          7.8
+          <a href="ch00/_reverse_commit.html" >Advanced Merging </a>
+        </li>
+        <li>
+          7.9
+          <a href="ch00/ref_rerere.html" >Rerere </a>
+        </li>
+        <li>
+          7.10
+          <a href="ch00/_file_annotation.html" >Debugging with Git </a>
+        </li>
+        <li>
+          7.11
+          <a href="ch00/_publishing_submodules.html" >Submodules </a>
+        </li>
+        <li>
+          7.12
+          <a href="ch00/_bundling.html" >Bundling </a>
+        </li>
+        <li>
+          7.13
+          <a href="ch00/_replace.html" >Replace </a>
+        </li>
+        <li>
+          7.14
+          <a href="ch00/_credential_caching.html" >Credential Storage </a>
+        </li>
+        <li>
+          7.15
+          <a href="Git-Tools-Summary.html" >Summary </a>
+        </li>
+    </ol>
+  </li>
+  <li class='chapter'>
+  <h2>8. <a href="ch00/_external_merge_tools.html">Customizing Git</a></h2>
+    <ol>
+        <li>
+          8.1
+          <a href="ch00/_external_merge_tools.html" >Git Configuration </a>
+        </li>
+        <li>
+          8.2
+          <a href="ch00/_keyword_expansion.html" >Git Attributes </a>
+        </li>
+        <li>
+          8.3
+          <a href="ch00/_email_hooks.html" >Git Hooks </a>
+        </li>
+        <li>
+          8.4
+          <a href="ch00/_enforcing_commit_message_format.html" >An Example Git-Enforced Policy </a>
+        </li>
+        <li>
+          8.5
+          <a href="Customizing-Git-Summary.html" >Summary </a>
+        </li>
+    </ol>
+  </li>
+  <li class='chapter'>
+  <h2>9. <a href="ch00/_git_svn.html">Git and Other Systems</a></h2>
+    <ol>
+        <li>
+          9.1
+          <a href="ch00/_git_svn.html" >Git as a Client </a>
+        </li>
+        <li>
+          9.2
+          <a href="ch00/_git_p4.html" class=active>Migrating to Git </a>
+        </li>
+        <li>
+          9.3
+          <a href="Git-and-Other-Systems-Summary.html" >Summary </a>
+        </li>
+    </ol>
+  </li>
+  <li class='chapter'>
+  <h2>10. <a href="ch00/_plumbing_porcelain.html">Git Internals</a></h2>
+    <ol>
+        <li>
+          10.1
+          <a href="ch00/_plumbing_porcelain.html" >Plumbing and Porcelain </a>
+        </li>
+        <li>
+          10.2
+          <a href="ch00/_git_commit_objects.html" >Git Objects </a>
+        </li>
+        <li>
+          10.3
+          <a href="ch00/ref_the_ref.html" >Git References </a>
+        </li>
+        <li>
+          10.4
+          <a href="Git-Internals-Packfiles.html" >Packfiles </a>
+        </li>
+        <li>
+          10.5
+          <a href="ch00/_pushing_refspecs.html" >The Refspec </a>
+        </li>
+        <li>
+          10.6
+          <a href="Git-Internals-Transfer-Protocols.html" >Transfer Protocols </a>
+        </li>
+        <li>
+          10.7
+          <a href="ch00/_git_gc.html" >Maintenance and Data Recovery </a>
+        </li>
+        <li>
+          10.8
+          <a href="Git-Internals-Environment-Variables.html" >Environment Variables </a>
+        </li>
+        <li>
+          10.9
+          <a href="Git-Internals-Summary.html" >Summary </a>
+        </li>
+    </ol>
+  </li>
+</ol>
+    </div>
+    <div class='column-right'>
+      <ol class='book-toc'>
+  <li class='chapter'>
+  <h2>A1. <a href="./Appendix-A:-Git-in-Other-Environments-Graphical-Interfaces.html">Appendix A: Git in Other Environments</a></h2>
+    <ol>
+        <li>
+          A1.1
+          <a href="./Appendix-A:-Git-in-Other-Environments-Graphical-Interfaces.html" >Graphical Interfaces </a>
+        </li>
+        <li>
+          A1.2
+          <a href="./Appendix-A:-Git-in-Other-Environments-Git-in-Visual-Studio.html" >Git in Visual Studio </a>
+        </li>
+        <li>
+          A1.3
+          <a href="./Appendix-A:-Git-in-Other-Environments-Git-in-Visual-Studio-Code.html" >Git in Visual Studio Code </a>
+        </li>
+        <li>
+          A1.4
+          <a href="./Appendix-A:-Git-in-Other-Environments-Git-in-IntelliJ-%252F-PyCharm-%252F-WebStorm-%252F-PhpStorm-%252F-RubyMine.html" >Git in IntelliJ / PyCharm / WebStorm / PhpStorm / RubyMine </a>
+        </li>
+        <li>
+          A1.5
+          <a href="./Appendix-A:-Git-in-Other-Environments-Git-in-Sublime-Text.html" >Git in Sublime Text </a>
+        </li>
+        <li>
+          A1.6
+          <a href="./Appendix-A:-Git-in-Other-Environments-Git-in-Bash.html" >Git in Bash </a>
+        </li>
+        <li>
+          A1.7
+          <a href="ch00/oh_my_zsh_git.html" >Git in Zsh </a>
+        </li>
+        <li>
+          A1.8
+          <a href="./Appendix-A:-Git-in-Other-Environments-Git-in-PowerShell.html" >Git in PowerShell </a>
+        </li>
+        <li>
+          A1.9
+          <a href="./Appendix-A:-Git-in-Other-Environments-Summary.html" >Summary </a>
+        </li>
+    </ol>
+  </li>
+  <li class='chapter'>
+  <h2>A2. <a href="./Appendix-B:-Embedding-Git-in-your-Applications-Command-line-Git.html">Appendix B: Embedding Git in your Applications</a></h2>
+    <ol>
+        <li>
+          A2.1
+          <a href="./Appendix-B:-Embedding-Git-in-your-Applications-Command-line-Git.html" >Command-line Git </a>
+        </li>
+        <li>
+          A2.2
+          <a href="ch00/_libgit2_bindings.html" >Libgit2 </a>
+        </li>
+        <li>
+          A2.3
+          <a href="./Appendix-B:-Embedding-Git-in-your-Applications-JGit.html" >JGit </a>
+        </li>
+        <li>
+          A2.4
+          <a href="./Appendix-B:-Embedding-Git-in-your-Applications-go-git.html" >go-git </a>
+        </li>
+        <li>
+          A2.5
+          <a href="./Appendix-B:-Embedding-Git-in-your-Applications-Dulwich.html" >Dulwich </a>
+        </li>
+    </ol>
+  </li>
+  <li class='chapter'>
+  <h2>A3. <a href="ch00/ch_core_editor.html">Appendix C: Git Commands</a></h2>
+    <ol>
+        <li>
+          A3.1
+          <a href="ch00/ch_core_editor.html" >Setup and Config </a>
+        </li>
+        <li>
+          A3.2
+          <a href="./Appendix-C:-Git-Commands-Getting-and-Creating-Projects.html" >Getting and Creating Projects </a>
+        </li>
+        <li>
+          A3.3
+          <a href="./Appendix-C:-Git-Commands-Basic-Snapshotting.html" >Basic Snapshotting </a>
+        </li>
+        <li>
+          A3.4
+          <a href="./Appendix-C:-Git-Commands-Branching-and-Merging.html" >Branching and Merging </a>
+        </li>
+        <li>
+          A3.5
+          <a href="./Appendix-C:-Git-Commands-Sharing-and-Updating-Projects.html" >Sharing and Updating Projects </a>
+        </li>
+        <li>
+          A3.6
+          <a href="./Appendix-C:-Git-Commands-Inspection-and-Comparison.html" >Inspection and Comparison </a>
+        </li>
+        <li>
+          A3.7
+          <a href="./Appendix-C:-Git-Commands-Debugging.html" >Debugging </a>
+        </li>
+        <li>
+          A3.8
+          <a href="./Appendix-C:-Git-Commands-Patching.html" >Patching </a>
+        </li>
+        <li>
+          A3.9
+          <a href="./Appendix-C:-Git-Commands-Email.html" >Email </a>
+        </li>
+        <li>
+          A3.10
+          <a href="./Appendix-C:-Git-Commands-External-Systems.html" >External Systems </a>
+        </li>
+        <li>
+          A3.11
+          <a href="./Appendix-C:-Git-Commands-Administration.html" >Administration </a>
+        </li>
+        <li>
+          A3.12
+          <a href="./Appendix-C:-Git-Commands-Plumbing-Commands.html" >Plumbing Commands </a>
+        </li>
+    </ol>
+  </li>
+</ol>
+    </div>
+  </div>
+ </div>
+    <span class="light" id="edition">
+      2nd Edition
+    </span>
+</div>
+<div id='main' class="book edition2">
+    <h1>9.2 Git and Other Systems - Migrating to Git</h1>
+  <div>
+<h2 id="_migrating">Migrating to Git</h2>
+<div class="paragraph">
+<p>
+If you have an existing codebase in another VCS but you’ve decided to start using Git, you must migrate your project one way or another.
+This section goes over some importers for common systems, and then demonstrates how to develop your own custom importer.
+You’ll learn how to import data from several of the bigger professionally used SCM systems, because they make up the majority of users who are switching, and because high-quality tools for them are easy to come by.</p>
+</div>
+<div class="sect3">
+<h3 id="_subversion">Subversion</h3>
+<div class="paragraph">
+<p>
+If you read the previous section about using <code>git svn</code>, you can easily use those instructions to <code>git svn clone</code> a repository; then, stop using the Subversion server, push to a new Git server, and start using that.
+If you want the history, you can accomplish that as quickly as you can pull the data out of the Subversion server (which may take a while).</p>
+</div>
+<div class="paragraph">
+<p>However, the import isn’t perfect; and because it will take so long, you may as well do it right.
+The first problem is the author information.
+In Subversion, each person committing has a user on the system who is recorded in the commit information.
+The examples in the previous section show <code>schacon</code> in some places, such as the <code>blame</code> output and the <code>git svn log</code>.
+If you want to map this to better Git author data, you need a mapping from the Subversion users to the Git authors.
+Create a file called <code>users.txt</code> that has this mapping in a format like this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>schacon = Scott Chacon &lt;schacon@geemail.com&gt;
+selse = Someo Nelse &lt;selse@geemail.com&gt;</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>To get a list of the author names that SVN uses, you can run this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ svn log --xml --quiet | grep author | sort -u | \
+  perl -pe 's/.*&gt;(.*?)&lt;.*/$1 = /'</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>That generates the log output in XML format, then keeps only the lines with author information, discards duplicates, strips out the XML tags.
+Obviously this only works on a machine with <code>grep</code>, <code>sort</code>, and <code>perl</code> installed.
+Then, redirect that output into your <code>users.txt</code> file so you can add the equivalent Git user data next to each entry.</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>If you’re trying this on a Windows machine, this is the point where you’ll run into trouble.
+Microsoft have provided some good advice and samples at <a href="https://docs.microsoft.com/en-us/azure/devops/repos/git/perform-migration-from-svn-to-git" class="bare">https://docs.microsoft.com/en-us/azure/devops/repos/git/perform-migration-from-svn-to-git</a>.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>You can provide this file to <code>git svn</code> to help it map the author data more accurately.
+You can also tell <code>git svn</code> not to include the metadata that Subversion normally imports, by passing <code>--no-metadata</code> to the <code>clone</code> or <code>init</code> command.
+The metadata includes a <code>git-svn-id</code> inside each commit message that Git will generate during import.
+This can bloat your Git log and might make it a bit unclear.</p>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>You need to keep the metadata when you want to mirror commits made in the Git repository back into the original SVN repository.
+If you don’t want the synchronization in your commit log, feel free to omit the <code>--no-metadata</code> parameter.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>This makes your <code>import</code> command look like this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git svn clone http://my-project.googlecode.com/svn/ \
+      --authors-file=users.txt --no-metadata --prefix "" -s my_project
+$ cd my_project</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now you should have a nicer Subversion import in your <code>my_project</code> directory.
+Instead of commits that look like this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>commit 37efa680e8473b615de980fa935944215428a35a
+Author: schacon &lt;schacon@4c93b258-373f-11de-be05-5f7a86268029&gt;
+Date:   Sun May 3 00:12:22 2009 +0000
+    fixed install - go to trunk
+    git-svn-id: https://my-project.googlecode.com/svn/trunk@94 4c93b258-373f-11de-
+    be05-5f7a86268029</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>they look like this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>commit 03a8785f44c8ea5cdb0e8834b7c8e6c469be2ff2
+Author: Scott Chacon &lt;schacon@geemail.com&gt;
+Date:   Sun May 3 00:12:22 2009 +0000
+    fixed install - go to trunk</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Not only does the Author field look a lot better, but the <code>git-svn-id</code> is no longer there, either.</p>
+</div>
+<div class="paragraph">
+<p>You should also do a bit of post-import cleanup.
+For one thing, you should clean up the weird references that <code>git svn</code> set up.
+First you’ll move the tags so they’re actual tags rather than strange remote branches, and then you’ll move the rest of the branches so they’re local.</p>
+</div>
+<div class="paragraph">
+<p>To move the tags to be proper Git tags, run:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ for t in $(git for-each-ref --format='%(refname:short)' refs/remotes/tags); do git tag ${t/tags\//} $t &amp;&amp; git branch -D -r $t; done</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This takes the references that were remote branches that started with <code>refs/remotes/tags/</code> and makes them real (lightweight) tags.</p>
+</div>
+<div class="paragraph">
+<p>Next, move the rest of the references under <code>refs/remotes</code> to be local branches:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ for b in $(git for-each-ref --format='%(refname:short)' refs/remotes); do git branch $b refs/remotes/$b &amp;&amp; git branch -D -r $b; done</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>It may happen that you’ll see some extra branches which are suffixed by <code>@xxx</code> (where xxx is a number), while in Subversion you only see one branch.
+This is actually a Subversion feature called “peg-revisions”, which is something that Git simply has no syntactical counterpart for.
+Hence, <code>git svn</code> simply adds the svn version number to the branch name just in the same way as you would have written it in svn to address the peg-revision of that branch.
+If you do not care anymore about the peg-revisions, simply remove them:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ for p in $(git for-each-ref --format='%(refname:short)' | grep @); do git branch -D $p; done</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now all the old branches are real Git branches and all the old tags are real Git tags.</p>
+</div>
+<div class="paragraph">
+<p>There’s one last thing to clean up.
+Unfortunately, <code>git svn</code> creates an extra branch named <code>trunk</code>, which maps to Subversion’s default branch, but the <code>trunk</code> ref points to the same place as <code>master</code>.
+Since <code>master</code> is more idiomatically Git, here’s how to remove the extra branch:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git branch -d trunk</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The last thing to do is add your new Git server as a remote and push to it.
+Here is an example of adding your server as a remote:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git remote add origin git@my-git-server:myrepository.git</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Because you want all your branches and tags to go up, you can now run this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git push origin --all
+$ git push origin --tags</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>All your branches and tags should be on your new Git server in a nice, clean import.</p>
+</div>
+</div>
+<div class="sect3">
+<h3 id="_mercurial">Mercurial</h3>
+<div class="paragraph">
+<p>
+Since Mercurial and Git have fairly similar models for representing versions, and since Git is a bit more flexible, converting a repository from Mercurial to Git is fairly straightforward, using a tool called "hg-fast-export", which you’ll need a copy of:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git clone https://github.com/frej/fast-export.git</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The first step in the conversion is to get a full clone of the Mercurial repository you want to convert:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ hg clone &lt;remote repo URL&gt; /tmp/hg-repo</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The next step is to create an author mapping file.
+Mercurial is a bit more forgiving than Git for what it will put in the author field for changesets, so this is a good time to clean house.
+Generating this is a one-line command in a <code>bash</code> shell:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ cd /tmp/hg-repo
+$ hg log | grep user: | sort | uniq | sed 's/user: *//' &gt; ../authors</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This will take a few seconds, depending on how long your project’s history is, and afterwards the <code>/tmp/authors</code> file will look something like this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>bob
+bob@localhost
+bob &lt;bob@company.com&gt;
+bob jones &lt;bob &lt;AT&gt; company &lt;DOT&gt; com&gt;
+Bob Jones &lt;bob@company.com&gt;
+Joe Smith &lt;joe@company.com&gt;</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>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: <code>"&lt;input&gt;"="&lt;output&gt;"</code>, mapping an <code>&lt;input&gt;</code> to an <code>&lt;output&gt;</code>.
+Inside the <code>&lt;input&gt;</code> and <code>&lt;output&gt;</code> strings, all escape sequences understood by the python <code>string_escape</code> encoding are supported.
+If the author mapping file does not contain a matching <code>&lt;input&gt;</code>, 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:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>"bob"="Bob Jones &lt;bob@company.com&gt;"
+"bob@localhost"="Bob Jones &lt;bob@company.com&gt;"
+"bob &lt;bob@company.com&gt;"="Bob Jones &lt;bob@company.com&gt;"
+"bob jones &lt;bob &lt;AT&gt; company &lt;DOT&gt; com&gt;"="Bob Jones &lt;bob@company.com&gt;"</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The same kind of mapping file can be used to rename branches and tags when the Mercurial name is not allowed by Git.</p>
+</div>
+<div class="paragraph">
+<p>The next step is to create our new Git repository, and run the export script:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git init /tmp/converted
+$ cd /tmp/converted
+$ /tmp/fast-export/hg-fast-export.sh -r /tmp/hg-repo -A /tmp/authors</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The <code>-r</code> flag tells hg-fast-export where to find the Mercurial repository we want to convert, and the <code>-A</code> flag tells it where to find the author-mapping file (branch and tag mapping files are specified by the <code>-B</code> and <code>-T</code> flags respectively).
+The script parses Mercurial changesets and converts them into a script for Git’s "fast-import" feature (which we’ll discuss in detail a bit later on).
+This takes a bit (though it’s <em>much</em> faster than it would be over the network), and the output is fairly verbose:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ /tmp/fast-export/hg-fast-export.sh -r /tmp/hg-repo -A /tmp/authors
+Loaded 4 authors
+master: Exporting full revision 1/22208 with 13/0/0 added/changed/removed files
+master: Exporting simple delta revision 2/22208 with 1/1/0 added/changed/removed files
+master: Exporting simple delta revision 3/22208 with 0/1/0 added/changed/removed files
+[…]
+master: Exporting simple delta revision 22206/22208 with 0/4/0 added/changed/removed files
+master: Exporting simple delta revision 22207/22208 with 0/2/0 added/changed/removed files
+master: Exporting thorough delta revision 22208/22208 with 3/213/0 added/changed/removed files
+Exporting tag [0.4c] at [hg r9] [git :10]
+Exporting tag [0.4d] at [hg r16] [git :17]
+[…]
+Exporting tag [3.1-rc] at [hg r21926] [git :21927]
+Exporting tag [3.1] at [hg r21973] [git :21974]
+Issued 22315 commands
+git-fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:     120000
+Total objects:       115032 (    208171 duplicates                  )
+      blobs  :        40504 (    205320 duplicates      26117 deltas of      39602 attempts)
+      trees  :        52320 (      2851 duplicates      47467 deltas of      47599 attempts)
+      commits:        22208 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:         109 (         2 loads     )
+      marks:        1048576 (     22208 unique    )
+      atoms:           1952
+Memory total:          7860 KiB
+       pools:          2235 KiB
+     objects:          5625 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 8589934592
+pack_report: pack_used_ctr            =      90430
+pack_report: pack_mmap_calls          =      46771
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =  340852700 /  340852700
+---------------------------------------------------------------------
+$ git shortlog -sn
+   369  Bob Jones
+   365  Joe Smith</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>That’s pretty much all there is to it.
+All of the Mercurial tags have been converted to Git tags, and Mercurial branches and bookmarks have been converted to Git branches.
+Now you’re ready to push the repository up to its new server-side home:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git remote add origin git@my-git-server:myrepository.git
+$ git push origin --all</code></pre>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h3 id="_bazaar">Bazaar</h3>
+<div class="paragraph">
+<p></p>
+</div>
+<div class="paragraph">
+<p>Bazaar is a DVCS tool much like Git, and as a result it’s pretty straightforward to convert a Bazaar repository into a Git one.
+To accomplish this, you’ll need to import the <code>bzr-fastimport</code> plugin.</p>
+</div>
+<div class="sect4">
+<h4 id="_getting_the_bzr_fastimport_plugin">Getting the bzr-fastimport plugin</h4>
+<div class="paragraph">
+<p>The procedure for installing the fastimport plugin is different on UNIX-like operating systems and on Windows.
+In the first case, the simplest is to install the <code>bzr-fastimport</code> package that will install all the required dependencies.</p>
+</div>
+<div class="paragraph">
+<p>For example, with Debian and derived, you would do the following:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ sudo apt-get install bzr-fastimport</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>With RHEL, you would do the following:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ sudo yum install bzr-fastimport</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>With Fedora, since release 22, the new package manager is dnf:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ sudo dnf install bzr-fastimport</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>If the package is not available, you may install it as a plugin:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ mkdir --parents ~/.bazaar/plugins     # creates the necessary folders for the plugins
+$ cd ~/.bazaar/plugins
+$ bzr branch lp:bzr-fastimport fastimport   # imports the fastimport plugin
+$ cd fastimport
+$ sudo python setup.py install --record=files.txt   # installs the plugin</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>For this plugin to work, you’ll also need the <code>fastimport</code> Python module.
+You can check whether it is present or not and install it with the following commands:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ python -c "import fastimport"
+Traceback (most recent call last):
+  File "&lt;string&gt;", line 1, in &lt;module&gt;
+ImportError: No module named fastimport
+$ pip install fastimport</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>If it is not available, you can download it at address <a href="https://pypi.python.org/pypi/fastimport/" class="bare">https://pypi.python.org/pypi/fastimport/</a>.</p>
+</div>
+<div class="paragraph">
+<p>In the second case (on Windows), <code>bzr-fastimport</code> is automatically installed with the standalone version and the default installation (let all the checkboxes checked).
+So in this case you have nothing to do.</p>
+</div>
+<div class="paragraph">
+<p>At this point, the way to import a Bazaar repository differs according to that you have a single branch or you are working with a repository that has several branches.</p>
+</div>
+</div>
+<div class="sect4">
+<h4 id="_project_with_a_single_branch">Project with a single branch</h4>
+<div class="paragraph">
+<p>Now <code>cd</code> in the directory that contains your Bazaar repository and initialize the Git repository:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ cd /path/to/the/bzr/repository
+$ git init</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now, you can simply export your Bazaar repository and convert it into a Git repository using the following command:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ bzr fast-export --plain . | git fast-import</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Depending on the size of the project, your Git repository is built in a lapse from a few seconds to a few minutes.</p>
+</div>
+</div>
+<div class="sect4">
+<h4 id="_case_of_a_project_with_a_main_branch_and_a_working_branch">Case of a project with a main branch and a working branch</h4>
+<div class="paragraph">
+<p>You can also import a Bazaar repository that contains branches.
+Let us suppose that you have two branches: one represents the main branch (myProject.trunk), the other one is the working branch (myProject.work).</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ ls
+myProject.trunk myProject.work</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Create the Git repository and <code>cd</code> into it:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git init git-repo
+$ cd git-repo</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Pull the <code>master</code> branch into git:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ bzr fast-export --export-marks=../marks.bzr ../myProject.trunk | \
+git fast-import --export-marks=../marks.git</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Pull the working branch into Git:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ bzr fast-export --marks=../marks.bzr --git-branch=work ../myProject.work | \
+git fast-import --import-marks=../marks.git --export-marks=../marks.git</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now <code>git branch</code> shows you the <code>master</code> branch as well as the <code>work</code> branch.
+Check the logs to make sure they’re complete and get rid of the <code>marks.bzr</code> and <code>marks.git</code> files.</p>
+</div>
+</div>
+<div class="sect4">
+<h4 id="_synchronizing_the_staging_area">Synchronizing the staging area</h4>
+<div class="paragraph">
+<p>Whatever the number of branches you had and the import method you used, your staging area is not synchronized with <code>HEAD</code>, and with the import of several branches, your working directory is not synchronized either.
+This situation is easily solved by the following command:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git reset --hard HEAD</code></pre>
+</div>
+</div>
+</div>
+<div class="sect4">
+<h4 id="_ignoring_the_files_that_were_ignored_with_bzrignore">Ignoring the files that were ignored with .bzrignore</h4>
+<div class="paragraph">
+<p>Now let’s have a look at the files to ignore.
+The first thing to do is to rename <code>.bzrignore</code> into <code>.gitignore</code>.
+If the <code>.bzrignore</code> file contains one or several lines starting with "!!" or "RE:", you’ll have to modify it and perhaps create several <code>.gitignore</code> files in order to ignore exactly the same files that Bazaar was ignoring.</p>
+</div>
+<div class="paragraph">
+<p>Finally, you will have to create a commit that contains this modification for the migration:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git mv .bzrignore .gitignore
+$ # modify .gitignore if needed
+$ git commit -am 'Migration from Bazaar to Git'</code></pre>
+</div>
+</div>
+</div>
+<div class="sect4">
+<h4 id="_sending_your_repository_to_the_server">Sending your repository to the server</h4>
+<div class="paragraph">
+<p>Here we are!
+Now you can push the repository onto its new home server:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git remote add origin git@my-git-server:mygitrepository.git
+$ git push origin --all
+$ git push origin --tags</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Your Git repository is ready to use.</p>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h3 id="_perforce_import">Perforce</h3>
+<div class="paragraph">
+<p>
+The next system you’ll look at importing from is Perforce.
+As we discussed above, there are two ways to let Git and Perforce talk to each other: git-p4 and Perforce Git Fusion.</p>
+</div>
+<div class="sect4">
+<h4 id="_perforce_git_fusion">Perforce Git Fusion</h4>
+<div class="paragraph">
+<p>Git Fusion makes this process fairly painless.
+Just configure your project settings, user mappings, and branches using a configuration file (as discussed in <a href="ch00/_p4_git_fusion.html">Git Fusion</a>), and clone the repository.
+Git Fusion leaves you with what looks like a native Git repository, which is then ready to push to a native Git host if you desire.
+You could even use Perforce as your Git host if you like.</p>
+</div>
+</div>
+<div class="sect4">
+<h4 id="_git_p4">Git-p4</h4>
+<div class="paragraph">
+<p>Git-p4 can also act as an import tool.
+As an example, we’ll import the Jam project from the Perforce Public Depot.
+To set up your client, you must export the P4PORT environment variable to point to the Perforce depot:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ export P4PORT=public.perforce.com:1666</code></pre>
+</div>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>In order to follow along, you’ll need a Perforce depot to connect with.
+We’ll be using the public depot at public.perforce.com for our examples, but you can use any depot you have access to.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>
+Run the <code>git p4 clone</code> command to import the Jam project from the Perforce server, supplying the depot and project path and the path into which you want to import the project:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git-p4 clone //guest/perforce_software/jam@all p4import
+Importing from //guest/perforce_software/jam@all into p4import
+Initialized empty Git repository in /private/tmp/p4import/.git/
+Import destination: refs/remotes/p4/master
+Importing revision 9957 (100%)</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This particular project has only one branch, but if you have branches that are configured with branch views (or just a set of directories), you can use the <code>--detect-branches</code> flag to <code>git p4 clone</code> to import all the project’s branches as well.
+See <a href="ch00/_git_p4_branches.html">Branching</a> for a bit more detail on this.</p>
+</div>
+<div class="paragraph">
+<p>At this point you’re almost done.
+If you go to the <code>p4import</code> directory and run <code>git log</code>, you can see your imported work:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git log -2
+commit e5da1c909e5db3036475419f6379f2c73710c4e6
+Author: giles &lt;giles@giles@perforce.com&gt;
+Date:   Wed Feb 8 03:13:27 2012 -0800
+    Correction to line 355; change &lt;/UL&gt; to &lt;/OL&gt;.
+    [git-p4: depot-paths = "//public/jam/src/": change = 8068]
+commit aa21359a0a135dda85c50a7f7cf249e4f7b8fd98
+Author: kwirth &lt;kwirth@perforce.com&gt;
+Date:   Tue Jul 7 01:35:51 2009 -0800
+    Fix spelling error on Jam doc page (cummulative -&gt; cumulative).
+    [git-p4: depot-paths = "//public/jam/src/": change = 7304]</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>You can see that <code>git-p4</code> has left an identifier in each commit message.
+It’s fine to keep that identifier there, in case you need to reference the Perforce change number later.
+However, if you’d like to remove the identifier, now is the time to do so – before you start doing work on the new repository.
+You can use <code>git filter-branch</code> to remove the identifier strings en masse:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git filter-branch --msg-filter 'sed -e "/^\[git-p4:/d"'
+Rewrite e5da1c909e5db3036475419f6379f2c73710c4e6 (125/125)
+Ref 'refs/heads/master' was rewritten</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>If you run <code>git log</code>, you can see that all the SHA-1 checksums for the commits have changed, but the <code>git-p4</code> strings are no longer in the commit messages:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git log -2
+commit b17341801ed838d97f7800a54a6f9b95750839b7
+Author: giles &lt;giles@giles@perforce.com&gt;
+Date:   Wed Feb 8 03:13:27 2012 -0800
+    Correction to line 355; change &lt;/UL&gt; to &lt;/OL&gt;.
+commit 3e68c2e26cd89cb983eb52c024ecdfba1d6b3fff
+Author: kwirth &lt;kwirth@perforce.com&gt;
+Date:   Tue Jul 7 01:35:51 2009 -0800
+    Fix spelling error on Jam doc page (cummulative -&gt; cumulative).</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Your import is ready to push up to your new Git server.</p>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h3 id="_custom_importer">A Custom Importer</h3>
+<div class="paragraph">
+<p>
+If your system isn’t one of the above, you should look for an importer online – quality importers are available for many other systems, including CVS, Clear Case, Visual Source Safe, even a directory of archives.
+If none of these tools works for you, you have a more obscure tool, or you otherwise need a more custom importing process, you should use <code>git fast-import</code>.
+This command reads simple instructions from stdin to write specific Git data.
+It’s much easier to create Git objects this way than to run the raw Git commands or try to write the raw objects (see <a href="ch00/ch10-git-internals.html">Git Internals</a> for more information).
+This way, you can write an import script that reads the necessary information out of the system you’re importing from and prints straightforward instructions to stdout.
+You can then run this program and pipe its output through <code>git fast-import</code>.</p>
+</div>
+<div class="paragraph">
+<p>To quickly demonstrate, you’ll write a simple importer.
+Suppose you work in <code>current</code>, you back up your project by occasionally copying the directory into a time-stamped <code>back_YYYY_MM_DD</code> backup directory, and you want to import this into Git.
+Your directory structure looks like this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ ls /opt/import_from
+back_2014_01_02
+back_2014_01_04
+back_2014_01_14
+back_2014_02_03
+current</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>In order to import a Git directory, you need to review how Git stores its data.
+As you may remember, Git is fundamentally a linked list of commit objects that point to a snapshot of content.
+All you have to do is tell <code>fast-import</code> what the content snapshots are, what commit data points to them, and the order they go in.
+Your strategy will be to go through the snapshots one at a time and create commits with the contents of each directory, linking each commit back to the previous one.</p>
+</div>
+<div class="paragraph">
+<p>As we did in <a href="ch00/_an_example_git_enforced_policy.html">An Example Git-Enforced Policy</a>, we’ll write this in Ruby, because it’s what we generally work with and it tends to be easy to read.
+You can write this example pretty easily in anything you’re familiar with – it just needs to print the appropriate information to <code>stdout</code>.
+And, if you are running on Windows, this means you’ll need to take special care to not introduce carriage returns at the end your lines – <code>git fast-import</code> is very particular about just wanting line feeds (LF) not the carriage return line feeds (CRLF) that Windows uses.</p>
+</div>
+<div class="paragraph">
+<p>To begin, you’ll change into the target directory and identify every subdirectory, each of which is a snapshot that you want to import as a commit.
+You’ll change into each subdirectory and print the commands necessary to export it.
+Your basic main loop looks like this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby">last_mark = nil
+# loop through the directories
+Dir.chdir(ARGV[0]) do
+  Dir.glob("*").each do |dir|
+    next if File.file?(dir)
+    # move into the target directory
+    Dir.chdir(dir) do
+      last_mark = print_export(dir, last_mark)
+    end
+  end
+end</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>You run <code>print_export</code> inside each directory, which takes the manifest and mark of the previous snapshot and returns the manifest and mark of this one; that way, you can link them properly.
+“Mark” is the <code>fast-import</code> term for an identifier you give to a commit; as you create commits, you give each one a mark that you can use to link to it from other commits.
+So, the first thing to do in your <code>print_export</code> method is generate a mark from the directory name:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby">mark = convert_dir_to_mark(dir)</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>You’ll do this by creating an array of directories and using the index value as the mark, because a mark must be an integer.
+Your method looks like this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby">$marks = []
+def convert_dir_to_mark(dir)
+  if !$marks.include?(dir)
+    $marks &lt;&lt; dir
+  end
+  ($marks.index(dir) + 1).to_s
+end</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now that you have an integer representation of your commit, you need a date for the commit metadata.
+Because the date is expressed in the name of the directory, you’ll parse it out.
+The next line in your <code>print_export</code> file is:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby">date = convert_dir_to_date(dir)</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>where <code>convert_dir_to_date</code> is defined as:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby">def convert_dir_to_date(dir)
+  if dir == 'current'
+    return Time.now().to_i
+  else
+    dir = dir.gsub('back_', '')
+    (year, month, day) = dir.split('_')
+    return Time.local(year, month, day).to_i
+  end
+end</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>That returns an integer value for the date of each directory.
+The last piece of meta-information you need for each commit is the committer data, which you hardcode in a global variable:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby">$author = 'John Doe &lt;john@example.com&gt;'</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now you’re ready to begin printing out the commit data for your importer.
+The initial information states that you’re defining a commit object and what branch it’s on, followed by the mark you’ve generated, the committer information and commit message, and then the previous commit, if any.
+The code looks like this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby"># print the import information
+puts 'commit refs/heads/master'
+puts 'mark :' + mark
+puts "committer #{$author} #{date} -0700"
+export_data('imported from ' + dir)
+puts 'from :' + last_mark if last_mark</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>You hardcode the time zone (-0700) because doing so is easy.
+If you’re importing from another system, you must specify the time zone as an offset.
+The commit message must be expressed in a special format:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>data (size)\n(contents)</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The format consists of the word data, the size of the data to be read, a newline, and finally the data.
+Because you need to use the same format to specify the file contents later, you create a helper method, <code>export_data</code>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby">def export_data(string)
+  print "data #{string.size}\n#{string}"
+end</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>All that’s left is to specify the file contents for each snapshot.
+This is easy, because you have each one in a directory – you can print out the <code>deleteall</code> command followed by the contents of each file in the directory.
+Git will then record each snapshot appropriately:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby">puts 'deleteall'
+Dir.glob("**/*").each do |file|
+  next if !File.file?(file)
+  inline_data(file)
+end</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Note:  Because many systems think of their revisions as changes from one commit to another, fast-import can also take commands with each commit to specify which files have been added, removed, or modified and what the new contents are.
+You could calculate the differences between snapshots and provide only this data, but doing so is more complex – you may as well give Git all the data and let it figure it out.
+If this is better suited to your data, check the <code>fast-import</code> man page for details about how to provide your data in this manner.</p>
+</div>
+<div class="paragraph">
+<p>The format for listing the new file contents or specifying a modified file with the new contents is as follows:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>M 644 inline path/to/file
+data (size)
+(file contents)</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Here, 644 is the mode (if you have executable files, you need to detect and specify 755 instead), and inline says you’ll list the contents immediately after this line.
+Your <code>inline_data</code> method looks like this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby">def inline_data(file, code = 'M', mode = '644')
+  content = File.read(file)
+  puts "#{code} #{mode} inline #{file}"
+  export_data(content)
+end</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>You reuse the <code>export_data</code> method you defined earlier, because it’s the same as the way you specified your commit message data.</p>
+</div>
+<div class="paragraph">
+<p>The last thing you need to do is to return the current mark so it can be passed to the next iteration:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby">return mark</code></pre>
+</div>
+</div>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>If you are running on Windows you’ll need to make sure that you add one extra step.
+As mentioned before, Windows uses CRLF for new line characters while <code>git fast-import</code> expects only LF.
+To get around this problem and make <code>git fast-import</code> happy, you need to tell ruby to use LF instead of CRLF:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby">$stdout.binmode</code></pre>
+</div>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="paragraph">
+<p>That’s it.
+Here’s the script in its entirety:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-ruby" data-lang="ruby">#!/usr/bin/env ruby
+$stdout.binmode
+$author = "John Doe &lt;john@example.com&gt;"
+$marks = []
+def convert_dir_to_mark(dir)
+    if !$marks.include?(dir)
+        $marks &lt;&lt; dir
+    end
+    ($marks.index(dir)+1).to_s
+end
+def convert_dir_to_date(dir)
+    if dir == 'current'
+        return Time.now().to_i
+    else
+        dir = dir.gsub('back_', '')
+        (year, month, day) = dir.split('_')
+        return Time.local(year, month, day).to_i
+    end
+end
+def export_data(string)
+    print "data #{string.size}\n#{string}"
+end
+def inline_data(file, code='M', mode='644')
+    content = File.read(file)
+    puts "#{code} #{mode} inline #{file}"
+    export_data(content)
+end
+def print_export(dir, last_mark)
+    date = convert_dir_to_date(dir)
+    mark = convert_dir_to_mark(dir)
+    puts 'commit refs/heads/master'
+    puts "mark :#{mark}"
+    puts "committer #{$author} #{date} -0700"
+    export_data("imported from #{dir}")
+    puts "from :#{last_mark}" if last_mark
+    puts 'deleteall'
+    Dir.glob("**/*").each do |file|
+        next if !File.file?(file)
+        inline_data(file)
+    end
+    mark
+end
+# Loop through the directories
+last_mark = nil
+Dir.chdir(ARGV[0]) do
+    Dir.glob("*").each do |dir|
+        next if File.file?(dir)
+        # move into the target directory
+        Dir.chdir(dir) do
+            last_mark = print_export(dir, last_mark)
+        end
+    end
+end</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>If you run this script, you’ll get content that looks something like this:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ ruby import.rb /opt/import_from
+commit refs/heads/master
+mark :1
+committer John Doe &lt;john@example.com&gt; 1388649600 -0700
+data 29
+imported from back_2014_01_02deleteall
+M 644 inline README.md
+data 28
+# Hello
+This is my readme.
+commit refs/heads/master
+mark :2
+committer John Doe &lt;john@example.com&gt; 1388822400 -0700
+data 29
+imported from back_2014_01_04from :1
+deleteall
+M 644 inline main.rb
+data 34
+#!/bin/env ruby
+puts "Hey there"
+M 644 inline README.md
+(...)</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>To run the importer, pipe this output through <code>git fast-import</code> while in the Git directory you want to import into.
+You can create a new directory and then run <code>git init</code> in it for a starting point, and then run your script:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git init
+Initialized empty Git repository in /opt/import_to/.git/
+$ ruby import.rb /opt/import_from | git fast-import
+git-fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           13 (         6 duplicates                  )
+      blobs  :            5 (         4 duplicates          3 deltas of          5 attempts)
+      trees  :            4 (         1 duplicates          0 deltas of          4 attempts)
+      commits:            4 (         1 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         5 unique    )
+      atoms:              2
+Memory total:          2344 KiB
+       pools:          2110 KiB
+     objects:           234 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 8589934592
+pack_report: pack_used_ctr            =         10
+pack_report: pack_mmap_calls          =          5
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       1457 /       1457
+---------------------------------------------------------------------</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>As you can see, when it completes successfully, it gives you a bunch of statistics about what it accomplished.
+In this case, you imported 13 objects total for 4 commits into 1 branch.
+Now, you can run <code>git log</code> to see your new history:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ git log -2
+commit 3caa046d4aac682a55867132ccdfbe0d3fdee498
+Author: John Doe &lt;john@example.com&gt;
+Date:   Tue Jul 29 19:39:04 2014 -0700
+    imported from current
+commit 4afc2b945d0d3c8cd00556fbe2e8224569dc9def
+Author: John Doe &lt;john@example.com&gt;
+Date:   Mon Feb 3 01:00:00 2014 -0700
+    imported from back_2014_02_03</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>There you go – a nice, clean Git repository.
+It’s important to note that nothing is checked out – you don’t have any files in your working directory at first.
+To get them, you must reset your branch to where <code>master</code> is now:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-console" data-lang="console">$ ls
+$ git reset --hard master
+HEAD is now at 3caa046 imported from current
+$ ls
+README.md main.rb</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>You can do a lot more with the <code>fast-import</code> tool – handle different modes, binary data, multiple branches and merging, tags, progress indicators, and more.
+A number of examples of more complex scenarios are available in the <code>contrib/fast-import</code> directory of the Git source code.</p>
+</div>
+</div>
+<div id="nav"><a href="ch00/_git_svn.html">prev</a> | <a href="Git-and-Other-Systems-Summary.html">next</a></div></div>
+</div>
+        </div>
+      </div>
+      <footer>
+  <div class="site-source">
+    <a href="https://git-scm.com/site">About this site</a><br>
+    Patches, suggestions, and comments are welcome.
+  </div>
+  <div class="sfc-member">
+    Git is a member of <a href="https://git-scm.com/sfc">Software Freedom Conservancy</a>
+  </div>
+</footer>
+<a href="ch00/_git_p4.html#top" class="no-js scrollToTop" id="scrollToTop" data-label="Scroll to top">
+  <img src="../../../images/icons/chevron-up@2x.png" width="20" height="20" alt="scroll-to-top"/>
+</a>
+<script src="../../../assets/application-38b0d42ff05ffea45841edebbd14b75b89585646153808e82907c2c5c11f324b.js"></script>
+    </div>
+</body>
+</html>