summaryrefslogtreecommitdiffstats
path: root/git-svn.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-01-10 05:05:11 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-01-10 05:05:11 +0000
commitdeab03612775a4b7c9ecc1fb93b56da36e7c24d7 (patch)
treec8d23de1963ec8a742c093d6ac7a116e1260bdbc /git-svn.html
parent1d3a6c7b01d9db283c9d0ababbd787b5ff9f48be (diff)
downloadgit-htmldocs-deab03612775a4b7c9ecc1fb93b56da36e7c24d7.tar.gz
Autogenerated HTML docs for v1.4.4.4-g1c23
Diffstat (limited to 'git-svn.html')
-rw-r--r--git-svn.html61
1 files changed, 5 insertions, 56 deletions
diff --git a/git-svn.html b/git-svn.html
index 6ac0965f5..49e63b689 100644
--- a/git-svn.html
+++ b/git-svn.html
@@ -622,8 +622,7 @@ after the authors-file is modified should continue operation.</p>
</dt>
<dd>
<p>
- Make git-svn less verbose. This only affects git-svn if you
- have the SVN::* libraries installed and are using them.
+ Make git-svn less verbose.
</p>
</dd>
<dt>
@@ -729,10 +728,6 @@ for more information on using GIT_SVN_ID.
started tracking a branch and never tracked the trunk it was
descended from.
</p>
-<div class="literalblock">
-<div class="content">
-<pre><tt>This relies on the SVN::* libraries to work.</tt></pre>
-</div></div>
<p>repo-config key: svn.followparent</p>
</dd>
<dt>
@@ -772,25 +767,6 @@ Only used with the <em>rebuild</em> command.
for tracking the remote.</p>
</dd>
<dt>
---no-ignore-externals
-</dt>
-<dd>
-<p>
-Only used with the <em>fetch</em> and <em>rebuild</em> command.
-</p>
-<p>This command has no effect when you are using the SVN::*
-libraries with git, svn:externals are always avoided.</p>
-<p>By default, git-svn passes --ignore-externals to svn to avoid
-fetching svn:external trees into git. Pass this flag to enable
-externals tracking directly via git.</p>
-<p>Versions of svn that do not support --ignore-externals are
-automatically detected and this flag will be automatically
-enabled for them.</p>
-<p>Otherwise, do not enable this flag unless you know what you're
-doing.</p>
-<p>repo-config key: svn.noignoreexternals</p>
-</dd>
-<dt>
--ignore-nodate
</dt>
<dd>
@@ -899,44 +875,17 @@ git commits with the following syntax:</p>
<div class="content">
<pre><tt> git-svn fetch 375=$(git-rev-parse HEAD)</tt></pre>
</div></div>
-<h3>Advanced Example: Tracking a Reorganized Repository</h3>
-<p>Note: this example is now obsolete if you have SVN::* libraries
-installed. Simply use --follow-parent when fetching.</p>
<p>If you're tracking a directory that has moved, or otherwise been
branched or tagged off of another directory in the repository and you
-care about the full history of the project, then you can read this
-section.</p>
-<p>This is how Yann Dirson tracked the trunk of the ufoai directory when
-the /trunk directory of his repository was moved to /ufoai/trunk and
-he needed to continue tracking /ufoai/trunk where /trunk left off.</p>
+care about the full history of the project, then you can use
+the --follow-parent option.</p>
<div class="listingblock">
<div class="content">
-<pre><tt> # This log message shows when the repository was reorganized:
- r166 | ydirson | 2006-03-02 01:36:55 +0100 (Thu, 02 Mar 2006) | 1 line
- Changed paths:
- D /trunk
- A /ufoai/trunk (from /trunk:165)
-
- # First we start tracking the old revisions:
- GIT_SVN_ID=git-oldsvn git-svn init \
- https://svn.sourceforge.net/svnroot/ufoai/trunk
- GIT_SVN_ID=git-oldsvn git-svn fetch -r1:165
-
- # And now, we continue tracking the new revisions:
- GIT_SVN_ID=git-newsvn git-svn init \
- https://svn.sourceforge.net/svnroot/ufoai/ufoai/trunk
- GIT_SVN_ID=git-newsvn git-svn fetch \
- 166=`git-rev-parse refs/remotes/git-oldsvn`</tt></pre>
+<pre><tt> git-svn fetch --follow-parent</tt></pre>
</div></div>
</div>
<h2>BUGS</h2>
<div class="sectionbody">
-<p>If you are not using the SVN::* Perl libraries and somebody commits a
-conflicting changeset to SVN at a bad moment (right before you commit)
-causing a conflict and your commit to fail, your svn working tree
-($GIT_DIR/git-svn/tree) may be dirtied. The easiest thing to do is
-probably just to rm -rf $GIT_DIR/git-svn/tree and run <em>rebuild</em>. You
-can avoid this problem entirely by using <em>dcommit</em>.</p>
<p>We ignore all SVN properties except svn:executable. Too difficult to
map them since we rely heavily on git write-tree being _exactly_ the
same on both the SVN and git working trees and I prefer not to clutter
@@ -962,7 +911,7 @@ detect them.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jan-2007 06:53:20 UTC
+Last updated 10-Jan-2007 05:05:02 UTC
</div>
</div>
</body>