From 345847c0115b69260f398e97e01061f4d4d22d0f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 29 Nov 2006 07:59:45 +0000 Subject: [PATCH] Autogenerated man pages for v1.4.4.1-gdf6b --- man1/git-svn.1 | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/man1/git-svn.1 b/man1/git-svn.1 index 7ec0b8212..01cfd5c87 100755 --- a/man1/git-svn.1 +++ b/man1/git-svn.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-SVN" "1" "11/09/2006" "" "" +.TH "GIT\-SVN" "1" "11/29/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -30,7 +30,7 @@ Creates an empty git repository with additional metadata directories for git\-sv Fetch unfetched revisions from the Subversion URL we are tracking. refs/remotes/git\-svn will be updated to the latest revision. .sp Note: You should never attempt to modify the remotes/git\-svn branch outside of git\-svn. Instead, create a branch from remotes/git\-svn and work on that branch. Use the -\fIcommit\fR +\fIdcommit\fR command (see below) to write git commits back to remotes/git\-svn. .sp See @@ -209,7 +209,8 @@ Print out the series of git arguments that would show which diffs would be commi .TP \-b , \-\-branch Used with -\fIfetch\fR +\fIfetch\fR, +\fIdcommit\fR or \fIcommit\fR. .sp @@ -287,7 +288,7 @@ If supplied git\-svn will convert \fI(no date)\fR entries to the UNIX epoch (midnight on Jan. 1, 1970). Yes, that's probably very wrong. SVN was very wrong. .SS "Basic Examples" -Tracking and contributing to an Subversion managed\-project: +Tracking and contributing to a Subversion\-managed project: .sp .sp .nf @@ -297,10 +298,9 @@ Tracking and contributing to an Subversion managed\-project: git\-svn fetch # Create your own branch to hack on: git checkout \-b my\-branch remotes/git\-svn -# Commit only the git commits you want to SVN: - git\-svn commit [ ...] -# Commit all the git commits from my\-branch that don't exist in SVN: - git\-svn commit remotes/git\-svn..my\-branch +# Do some work, and then commit your new changes to SVN, as well as +# automatically updating your working HEAD: + git\-svn dcommit # Something is committed to SVN, rebase the latest into your branch: git\-svn fetch && git rebase remotes/git\-svn # Append svn:ignore settings to the default git exclude file: @@ -312,12 +312,10 @@ Originally, git\-svn recommended that the remotes/git\-svn branch be pulled from If you use \fIgit\-svn commit A..B\fR to commit several diffs and you do not have the latest remotes/git\-svn merged into my\-branch, you should use \fIgit rebase\fR to update your work branch instead of \fIgit pull\fR. \fIpull\fR can cause non\-linear history to be flattened when committing into SVN, which can lead to merge commits reversing previous commits in SVN. .sp .SH "DESIGN PHILOSOPHY" -Merge tracking in Subversion is lacking and doing branched development with Subversion is cumbersome as a result. git\-svn completely forgoes any automated merge/branch tracking on the Subversion side and leaves it entirely up to the user on the git side. It's simply not worth it to do a useful translation when the original signal is weak. +Merge tracking in Subversion is lacking and doing branched development with Subversion is cumbersome as a result. git\-svn does not do automated merge/branch tracking by default and leaves it entirely up to the user on the git side. .sp .SH "TRACKING MULTIPLE REPOSITORIES OR BRANCHES" -This is for advanced users, most users should ignore this section. -.sp -Because git\-svn does not care about relationships between different branches or directories in a Subversion repository, git\-svn has a simple hack to allow it to track an arbitrary number of related _or_ unrelated SVN repositories via one git repository. Simply set the GIT_SVN_ID environment variable to a name other other than "git\-svn" (the default) and git\-svn will ignore the contents of the $GIT_DIR/svn/git\-svn directory and instead do all of its work in $GIT_DIR/svn/$GIT_SVN_ID for that invocation. The interface branch will be remotes/$GIT_SVN_ID, instead of remotes/git\-svn. Any remotes/$GIT_SVN_ID branch should never be modified by the user outside of git\-svn commands. +Because git\-svn does not care about relationships between different branches or directories in a Subversion repository, git\-svn has a simple hack to allow it to track an arbitrary number of related _or_ unrelated SVN repositories via one git repository. Simply use the \-\-id/\-i flag or set the GIT_SVN_ID environment variable to a name other other than "git\-svn" (the default) and git\-svn will ignore the contents of the $GIT_DIR/svn/git\-svn directory and instead do all of its work in $GIT_DIR/svn/$GIT_SVN_ID for that invocation. The interface branch will be remotes/$GIT_SVN_ID, instead of remotes/git\-svn. Any remotes/$GIT_SVN_ID branch should never be modified by the user outside of git\-svn commands. .sp .SH "ADDITIONAL FETCH ARGUMENTS" This is for advanced users, most users should ignore this section. @@ -361,7 +359,7 @@ This is how Yann Dirson tracked the trunk of the ufoai directory when the /trunk 166=`git\-rev\-parse refs/remotes/git\-oldsvn` .fi .SH "BUGS" -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 \fIrebuild\fR. +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 \fIrebuild\fR. You can avoid this problem entirely by using \fIdcommit\fR. .sp 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 working trees with metadata files. .sp -- 2.26.2