Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(981)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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, 2 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 unified diff | Download patch
« git-auto-svn ('K') | « git_footers.py ('k') | man/man1/git-auto-svn.1 » ('j') | man/src/git-auto-svn.txt » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> 2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4 <head> 4 <head>
5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / > 5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / >
6 <meta name="generator" content="AsciiDoc 8.6.9" /> 6 <meta name="generator" content="AsciiDoc 8.6.9" />
7 <title>git-reparent-branch(1)</title> 7 <title>git-auto-svn(1)</title>
8 <style type="text/css"> 8 <style type="text/css">
9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ 9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10 10
11 /* Default font. */ 11 /* Default font. */
12 body { 12 body {
13 font-family: Georgia,serif; 13 font-family: Georgia,serif;
14 } 14 }
15 15
16 /* Title font. */ 16 /* Title font. */
17 h1, h2, h3, h4, h5, h6, 17 h1, h2, h3, h4, h5, h6,
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 } 734 }
735 735
736 } 736 }
737 asciidoc.install(); 737 asciidoc.install();
738 /*]]>*/ 738 /*]]>*/
739 </script> 739 </script>
740 </head> 740 </head>
741 <body class="manpage"> 741 <body class="manpage">
742 <div id="header"> 742 <div id="header">
743 <h1> 743 <h1>
744 git-reparent-branch(1) Manual Page 744 git-auto-svn(1) Manual Page
745 </h1> 745 </h1>
746 <h2>NAME</h2> 746 <h2>NAME</h2>
747 <div class="sectionbody"> 747 <div class="sectionbody">
748 <p>git-reparent-branch - 748 <p>git-auto-svn -
749 Alter the parentage (upstream) for the current branch. 749 Automatically set up git-svn metadata for a repo mirrored from SVN.
750 </p> 750 </p>
751 </div> 751 </div>
752 </div> 752 </div>
753 <div id="content"> 753 <div id="content">
754 <div class="sect1"> 754 <div class="sect1">
755 <h2 id="_synopsis">SYNOPSIS</h2> 755 <h2 id="_synopsis">SYNOPSIS</h2>
756 <div class="sectionbody"> 756 <div class="sectionbody">
757 <div class="verseblock"> 757 <div class="verseblock">
758 <pre class="content"><em>git reparent-branch</em> &lt;new_parent&gt; 758 <pre class="content"><em>git auto-svn</em></pre>
759 <em>git reparent-branch</em> --lkgr
760 <em>git reparent-branch</em> --root</pre>
761 <div class="attribution"> 759 <div class="attribution">
762 </div></div> 760 </div></div>
763 </div> 761 </div>
764 </div> 762 </div>
765 <div class="sect1"> 763 <div class="sect1">
766 <h2 id="_description">DESCRIPTION</h2> 764 <h2 id="_description">DESCRIPTION</h2>
767 <div class="sectionbody"> 765 <div class="sectionbody">
768 <div class="paragraph"><p>Change the <em>upstream</em> of the current branch, an d then run 766 <div class="paragraph"><p><code>git auto-svn</code> automatically sets up git-sv n metadata and runs git-svn fetch for
769 <a href="git-rebase-update.html">git-rebase-update(1)</a> to move the commits in the current branch, as well 767 repos that are homed in SVN but mirrored to Git (such as depot_tools itself).</p ></div>
770 as the commits in all descendant branches, onto the new parent.</p></div> 768 <div class="paragraph"><p>It determines the metadata to use by inspecting the <c ode>git-svn-id</code> footer of the
771 <div class="paragraph"><p><code>&lt;new_parent&gt;</code> may be either a local branch, remote branch, OR a tag (such as 769 HEAD of the remote upstream ref (by default, <code>origin/master</code>). <code> git-svn-id</code>
772 <code>lkgr</code>).</p></div> 770 footers look like this:</p></div>
773 <div class="paragraph"><p>This is particularly useful to reparent an independent CL to become dependent on 771 <div class="literalblock">
774 another CL, or vice versa. This could happen if you started both on the 772 <div class="content">
775 assumption that they were independent, but later realized that this was not the 773 <pre><code>git-svn-id: svn://some.host.org/repo/path/to/a/sub/folder@123456 0039 d316-1c4b-4281-b951-d872f2087c98</code></pre>
776 case.</p></div> 774 </div></div>
775 <div class="paragraph"><p><code>git auto-svn</code> extracts the repository url
776 (svn://some.host.org/repo/path/to/a/sub/folder) from the <code>git-svn-id</code> , and
777 splits it into the root repository (svn://some.host.org/repo) and the path
778 within that repository (/path/to/a/sub/folder).</p></div>
779 <div class="paragraph"><p>It then sets up the following stanza in .git/config:</ p></div>
780 <div class="literalblock">
781 <div class="content">
782 <pre><code>[svn-remote "svn"]
783 url = svn://some.host.org/repo
784 fetch = path/to/a/sub/folder:refs/remotes/origin/master</code></pre>
785 </div></div>
786 <div class="paragraph"><p>Finally, it runs <code>git svn fetch</code> to pull in the data from the svn remote.</p></div>
777 </div> 787 </div>
778 </div> 788 </div>
779 <div class="sect1"> 789 <div class="sect1">
780 <h2 id="_options">OPTIONS</h2> 790 <h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>
781 <div class="sectionbody"> 791 <div class="sectionbody">
782 <div class="dlist"><dl> 792 <div class="sect2">
783 <dt class="hdlist1"> 793 <h3 id="_svn_remote_svn_url">svn-remote.svn.url</h3>
784 &lt;new_parent&gt; 794 <div class="paragraph"><p>This is the url of the root of the remote svn reposito ry.</p></div>
785 </dt> 795 </div>
786 <dd> 796 <div class="sect2">
787 <p> 797 <h3 id="_svn_remote_svn_fetch">svn-remote.svn.fetch</h3>
788 The new parent to set as the upstream for this branch. May be a branch ref or 798 <div class="paragraph"><p>This looks like a git refspec, but maps a subdirectory of the svn repository
789 a tag. 799 to a single ref in the git remote.</p></div>
790 </p> 800 </div>
791 </dd>
792 <dt class="hdlist1">
793 --lkgr
794 </dt>
795 <dd>
796 <p>
797 Reparent to track lkgr.
798 </p>
799 </dd>
800 <dt class="hdlist1">
801 --root
802 </dt>
803 <dd>
804 <p>
805 Reparent to track the <em>root</em> branch. Defaults to <em>origin/master</em> . See
806 <a href="git-new-branch.html">git-new-branch(1)</a>'s CONFIGURATION VARIABLES section..
807 </p>
808 </dd>
809 </dl></div>
810 </div> 801 </div>
811 </div> 802 </div>
812 <div class="sect1"> 803 <div class="sect1">
813 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2> 804 <h2 id="_example">EXAMPLE</h2>
814 <div class="sectionbody"> 805 <div class="sectionbody">
815 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em> 806 <div class="literalblock">
816 file.</p></div>
817 <div class="listingblock">
818 <div class="content"> 807 <div class="content">
819 <pre><code>[alias] 808 <pre><code>git clone https://chromium.googlesource.com/chromium/tools/depot_tool s
820 git rp = reparent-branch</code></pre> 809 cd depot_tools
810 git auto-svn</code></pre>
811 </div></div>
812 <div class="paragraph"><p>This results in the following stanza in <code>depot_to ols/.git/config</code>:</p></div>
813 <div class="literalblock">
814 <div class="content">
815 <pre><code>[svn-remote "svn"]
816 url = svn://svn.chromium.org/chrome
817 fetch = trunk/tools/depot_tools:refs/remotes/origin/master</code></pre>
821 </div></div> 818 </div></div>
822 </div> 819 </div>
823 </div> 820 </div>
824 <div class="sect1"> 821 <div class="sect1">
825 <h2 id="_see_also">SEE ALSO</h2>
826 <div class="sectionbody">
827 <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>,
828 <a href="git-new-branch.html">git-new-branch(1)</a>, <a href="git-upstream-diff. html">git-upstream-diff(1)</a></p></div>
829 </div>
830 </div>
831 <div class="sect1">
832 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 822 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
833 <div class="sectionbody"> 823 <div class="sectionbody">
834 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 824 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
835 assist with the development of chromium and related projects. Download the tools 825 assist with the development of chromium and related projects. Download the tools
836 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 826 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
837 </div> 827 </div>
838 </div> 828 </div>
839 </div> 829 </div>
840 <div id="footnotes"><hr /></div> 830 <div id="footnotes"><hr /></div>
841 <div id="footer"> 831 <div id="footer">
842 <div id="footer-text"> 832 <div id="footer-text">
843 Last updated 2014-04-10 14:23:11 PDT 833 Last updated 2014-09-30 16:15:22 CEST
844 </div> 834 </div>
845 </div> 835 </div>
846 </body> 836 </body>
847 </html> 837 </html>
OLDNEW
« git-auto-svn ('K') | « git_footers.py ('k') | man/man1/git-auto-svn.1 » ('j') | man/src/git-auto-svn.txt » ('J')

Powered by Google App Engine
This is Rietveld 408576698