man/html/git-auto-svn.html - Issue 611253003: Introduct git-auto-svn

Unified Diff: man/html/git-auto-svn.html

Issue 611253003: Introduct git-auto-svn (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Better docs Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: man/html/git-auto-svn.html

diff --git a/man/html/git-reparent-branch.html b/man/html/git-auto-svn.html

similarity index 86%

copy from man/html/git-reparent-branch.html

copy to man/html/git-auto-svn.html

index ba8a0fc78b8637fab9859e589f3ff7e49a7a66b7..24445d0330f3a874a01698e055842c98da3c0409 100644

--- a/man/html/git-reparent-branch.html

+++ b/man/html/git-auto-svn.html

@@ -4,7 +4,7 @@

<head>

-<title>git-reparent-branch(1)</title>

+<title>git-auto-svn(1)</title>

/* Shared CSS for AsciiDoc xhtml11 and html5 backends */

@@ -741,12 +741,12 @@ asciidoc.install();

<h1>

-git-reparent-branch(1) Manual Page

+git-auto-svn(1) Manual Page

</h1>

-<p>git-reparent-branch -

- Alter the parentage (upstream) for the current branch.

+<p>git-auto-svn -

+ Automatically set up git-svn metadata for a repo mirrored from SVN.

</p>

</div>

@@ -755,9 +755,7 @@ git-reparent-branch(1) Manual Page

<h2 id="_synopsis">SYNOPSIS</h2>

-<pre class="content"><em>git reparent-branch</em> <new_parent>

-<em>git reparent-branch</em> --lkgr

-<em>git reparent-branch</em> --root</pre>

+<pre class="content"><em>git auto-svn</em></pre>

</div></div>

</div>

@@ -765,67 +763,59 @@ git-reparent-branch(1) Manual Page

<h2 id="_description">DESCRIPTION</h2>

-<div class="paragraph"><p>Change the <em>upstream</em> of the current branch, and then run

-<a href="git-rebase-update.html">git-rebase-update(1)</a> to move the commits in the current branch, as well

-as the commits in all descendant branches, onto the new parent.</p></div>

-<div class="paragraph"><p><code><new_parent></code> may be either a local branch, remote branch, OR a tag (such as

-<code>lkgr</code>).</p></div>

-<div class="paragraph"><p>This is particularly useful to reparent an independent CL to become dependent on

-another CL, or vice versa. This could happen if you started both on the

-assumption that they were independent, but later realized that this was not the

-case.</p></div>

+<div class="paragraph"><p><code>git auto-svn</code> automatically sets up git-svn metadata and runs git-svn fetch for

+repos that are homed in SVN but mirrored to Git (such as depot_tools itself).</p></div>

+<div class="paragraph"><p>It determines the metadata to use by inspecting the <code>git-svn-id</code> footer of the

+HEAD of the remote upstream ref (by default, <code>origin/master</code>). <code>git-svn-id</code>

+footers look like this:</p></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>git-svn-id: svn://some.host.org/repo/path/to/a/sub/folder@123456 0039d316-1c4b-4281-b951-d872f2087c98</code></pre>

+</div></div>

+<div class="paragraph"><p><code>git auto-svn</code> extracts the repository url

+(svn://some.host.org/repo/path/to/a/sub/folder) from the <code>git-svn-id</code>, and

+splits it into the root repository (svn://some.host.org/repo) and the path

+within that repository (/path/to/a/sub/folder).</p></div>

+<div class="paragraph"><p>It then sets up the following stanza in .git/config:</p></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>[svn-remote "svn"]

+ url = svn://some.host.org/repo

+ fetch = path/to/a/sub/folder:refs/remotes/origin/master</code></pre>

+</div></div>

+<div class="paragraph"><p>Finally, it runs <code>git svn fetch</code> to pull in the data from the svn remote.</p></div>

</div>

-<h2 id="_options">OPTIONS</h2>

+<h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>

-<div class="dlist"><dl>

-<dt class="hdlist1">

-<new_parent>

-</dt>

-<dd>

-<p>

- The new parent to set as the upstream for this branch. May be a branch ref or

- a tag.

-</p>

-</dd>

-<dt class="hdlist1">

---lkgr

-</dt>

-<dd>

-<p>

- Reparent to track lkgr.

-</p>

-</dd>

-<dt class="hdlist1">

---root

-</dt>

-<dd>

-<p>

- Reparent to track the <em>root</em> branch. Defaults to <em>origin/master</em>. See

- <a href="git-new-branch.html">git-new-branch(1)</a>'s CONFIGURATION VARIABLES section..

-</p>

-</dd>

-</dl></div>

+<div class="sect2">

+<h3 id="_svn_remote_svn_url">svn-remote.svn.url</h3>

+<div class="paragraph"><p>This is the url of the root of the remote svn repository.</p></div>

</div>

+<div class="sect2">

+<h3 id="_svn_remote_svn_fetch">svn-remote.svn.fetch</h3>

+<div class="paragraph"><p>This looks like a git refspec, but maps a subdirectory of the svn repository

+to a single ref in the git remote.</p></div>

</div>

-<div class="sect1">

-<h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>

-<div class="sectionbody">

-<div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>

-file.</p></div>

-<div class="listingblock">

-<div class="content">

-<pre><code>[alias]

- git rp = reparent-branch</code></pre>

-</div></div>

</div>

-<h2 id="_see_also">SEE ALSO</h2>

+<h2 id="_example">EXAMPLE</h2>

-<div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)</a>, <a href="git-rename-branch.html">git-rename-branch(1)</a>,

-<a href="git-new-branch.html">git-new-branch(1)</a>, <a href="git-upstream-diff.html">git-upstream-diff(1)</a></p></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>git clone https://chromium.googlesource.com/chromium/tools/depot_tools

+cd depot_tools

+git auto-svn</code></pre>

+</div></div>

+<div class="paragraph"><p>This results in the following stanza in <code>depot_tools/.git/config</code>:</p></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>[svn-remote "svn"]

+ url = svn://svn.chromium.org/chrome

+ fetch = trunk/tools/depot_tools:refs/remotes/origin/master</code></pre>

+</div></div>

</div>

@@ -840,7 +830,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">

-Last updated 2014-04-10 14:23:11 PDT

+Last updated 2014-09-30 16:15:22 CEST

</div>

</body>

« git-auto-svn ('K') | « git_footers.py ('k') | man/man1/git-auto-svn.1 » ('j') | man/src/git-auto-svn.txt » ('J')