@matheusbsbs / matheus-bagliano / commits / cec21ca7cf
Fork 0

Update git-svn manpage to remove the implication that SVN::* is optional.

Now that git-svn requires the SVN::* Perl library, the manpage doesn't need to describe what happens when you don't have it. Signed-off-by: Steven Grimm <koreth@midwinter.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>

Steven Grimm committed Jan 9, 2007 at 16:20 UTC cec21ca7cfd5d8fd19ea87e15f14dce6ee3b3859
1 file changed +6 -59
Documentation/git-svn.txt
+6 -59
@@ -249,8 +249,7 @@ repo-config key: svn.authorsfile
249
250 -q::
251 --quiet::
252 - Make git-svn less verbose. This only affects git-svn if you
253 - have the SVN::* libraries installed and are using them.
252 + Make git-svn less verbose.
253
254 --repack[=<n>]::
255 --repack-flags=<flags>
@@ -321,8 +320,6 @@ for more information on using GIT_SVN_ID.
320 started tracking a branch and never tracked the trunk it was
321 descended from.
322
324 - This relies on the SVN::* libraries to work.
325 -
323 repo-config key: svn.followparent
324
325 --no-metadata::
@@ -350,25 +347,6 @@ Run this if you used an old version of git-svn that used
347 "git-svn-HEAD" instead of "remotes/git-svn" as the branch
348 for tracking the remote.
349
353 ---no-ignore-externals::
354 -Only used with the 'fetch' and 'rebuild' command.
355 -
356 -This command has no effect when you are using the SVN::*
357 -libraries with git, svn:externals are always avoided.
358 -
359 -By default, git-svn passes --ignore-externals to svn to avoid
360 -fetching svn:external trees into git. Pass this flag to enable
361 -externals tracking directly via git.
362 -
363 -Versions of svn that do not support --ignore-externals are
364 -automatically detected and this flag will be automatically
365 -enabled for them.
366 -
367 -Otherwise, do not enable this flag unless you know what you're
368 -doing.
369 -
370 -repo-config key: svn.noignoreexternals
371 -
350 --ignore-nodate::
351 Only used with the 'fetch' command.
352
@@ -486,49 +464,18 @@ This allows you to tie unfetched SVN revision 375 to your current HEAD:
464 git-svn fetch 375=$(git-rev-parse HEAD)
465 ------------------------------------------------
466
489 -Advanced Example: Tracking a Reorganized Repository
490 -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
491 -Note: this example is now obsolete if you have SVN::* libraries
492 -installed. Simply use --follow-parent when fetching.
493 -
467 If you're tracking a directory that has moved, or otherwise been
468 branched or tagged off of another directory in the repository and you
496 -care about the full history of the project, then you can read this
497 -section.
498 -
499 -This is how Yann Dirson tracked the trunk of the ufoai directory when
500 -the /trunk directory of his repository was moved to /ufoai/trunk and
501 -he needed to continue tracking /ufoai/trunk where /trunk left off.
469 +care about the full history of the project, then you can use
470 +the --follow-parent option.
471
503 -------------------------------------------------------------------------
504 - # This log message shows when the repository was reorganized:
505 - r166 | ydirson | 2006-03-02 01:36:55 +0100 (Thu, 02 Mar 2006) | 1 line
506 - Changed paths:
507 - D /trunk
508 - A /ufoai/trunk (from /trunk:165)
509 -
510 - # First we start tracking the old revisions:
511 - GIT_SVN_ID=git-oldsvn git-svn init \
512 - https://svn.sourceforge.net/svnroot/ufoai/trunk
513 - GIT_SVN_ID=git-oldsvn git-svn fetch -r1:165
514 -
515 - # And now, we continue tracking the new revisions:
516 - GIT_SVN_ID=git-newsvn git-svn init \
517 - https://svn.sourceforge.net/svnroot/ufoai/ufoai/trunk
518 - GIT_SVN_ID=git-newsvn git-svn fetch \
519 - 166=`git-rev-parse refs/remotes/git-oldsvn`
520 -------------------------------------------------------------------------
472 +------------------------------------------------
473 + git-svn fetch --follow-parent
474 +------------------------------------------------
475
476 BUGS
477 ----
478
525 -If you are not using the SVN::* Perl libraries and somebody commits a
526 -conflicting changeset to SVN at a bad moment (right before you commit)
527 -causing a conflict and your commit to fail, your svn working tree
528 -($GIT_DIR/git-svn/tree) may be dirtied. The easiest thing to do is
529 -probably just to rm -rf $GIT_DIR/git-svn/tree and run 'rebuild'. You
530 -can avoid this problem entirely by using 'dcommit'.
531 -
479 We ignore all SVN properties except svn:executable. Too difficult to
480 map them since we rely heavily on git write-tree being _exactly_ the
481 same on both the SVN and git working trees and I prefer not to clutter