From: Junio C Hamano Date: Thu, 26 May 2011 16:39:40 +0000 (-0700) Subject: Merge branch 'ss/doc-svn' into maint X-Git-Tag: v1.7.5.3~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7eacaeffd7c2cda1a50a643a7c0c144fea01c76f?ds=inline;hp=-c Merge branch 'ss/doc-svn' into maint * ss/doc-svn: remove noise and inaccuracies from git-svn docs --- 7eacaeffd7c2cda1a50a643a7c0c144fea01c76f diff --combined Documentation/git-svn.txt index 509dc03376,abf7089738..39feb62129 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@@ -145,6 -145,17 +145,6 @@@ Skip "branches" and "tags" of first lev ------------------------------------------------------------------------ -- ---use-log-author;; - When retrieving svn commits into git (as part of fetch, rebase, or - dcommit operations), look for the first From: or Signed-off-by: line - in the log message and use that as the author string. ---add-author-from;; - When committing to svn from git (as part of commit or dcommit - operations), if the existing log message doesn't already have a - From: or Signed-off-by: line, append a From: line based on the - git commit's author string. If you use this, then --use-log-author - will retrieve a valid author string for all commits. - 'clone':: Runs 'init' and 'fetch'. It will automatically create a directory based on the basename of the URL passed to it; @@@ -561,17 -572,6 +561,17 @@@ repository that will be fetched from For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag. +--use-log-author:: + When retrieving svn commits into git (as part of 'fetch', 'rebase', or + 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line + in the log message and use that as the author string. +--add-author-from:: + When committing to svn from git (as part of 'commit-diff', 'set-tree' or 'dcommit' + operations), if the existing log message doesn't already have a + `From:` or `Signed-off-by:` line, append a `From:` line based on the + git commit's author string. If you use this, then `--use-log-author` + will retrieve a valid author string for all commits. + ADVANCED OPTIONS ---------------- @@@ -655,16 -655,6 +655,16 @@@ svn-remote..rewriteUUID: where the original UUID is not available via either useSvmProps or useSvnsyncProps. +svn-remote..pushurl:: + + Similar to git's 'remote..pushurl', this key is designed + to be used in cases where 'url' points to an SVN repository + via a read-only transport, to provide an alternate read/write + transport. It is assumed that both keys point to the same + repository. Unlike 'commiturl', 'pushurl' is a base path. If + either 'commiturl' or 'pushurl' could be used, 'commiturl' + takes precedence. + svn.brokenSymlinkWorkaround:: This disables potentially expensive checks to workaround broken symlinks checked into SVN by broken clients. Set this @@@ -774,10 -764,9 +774,9 @@@ use `git svn rebase` to update your wor when committing into SVN, which can lead to merge commits reversing previous commits in SVN. - DESIGN PHILOSOPHY - ----------------- - Merge tracking in Subversion is lacking and doing branched development - with Subversion can be cumbersome as a result. While 'git svn' can track + MERGE TRACKING + -------------- + While 'git svn' can track copy history (including branches and tags) for repositories adopting a standard layout, it cannot yet represent merge history that happened inside git back upstream to SVN users. Therefore it is advised that @@@ -787,16 -776,15 +786,15 @@@ compatibility with SVN (see the CAVEAT CAVEATS ------- - For the sake of simplicity and interoperating with a less-capable system - (SVN), it is recommended that all 'git svn' users clone, fetch and dcommit + For the sake of simplicity and interoperating with Subversion, + it is recommended that all 'git svn' users clone, fetch and dcommit directly from the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push' operations between git repositories and branches. The recommended method of exchanging code between git branches and users is 'git format-patch' and 'git am', or just 'dcommit'ing to the SVN repository. Running 'git merge' or 'git pull' is NOT recommended on a branch you - plan to 'dcommit' from. Subversion does not represent merges in any - reasonable or useful fashion; so users using Subversion cannot see any + plan to 'dcommit' from because Subversion users cannot see any merges you've made. Furthermore, if you merge or pull from a git branch that is a mirror of an SVN branch, 'dcommit' may commit to the wrong branch. @@@ -846,7 -834,7 +844,7 @@@ Renamed and copied directories are not tracked when committing to SVN. I do not plan on adding support for this as it's quite difficult and time-consuming to get working for all the possible corner cases (git doesn't do it, either). Committing - renamed and copied files are fully supported if they're similar enough + renamed and copied files is fully supported if they're similar enough for git to detect them. CONFIGURATION @@@ -895,6 -883,10 +893,6 @@@ SEE ALS -------- linkgit:git-rebase[1] -Author ------- -Written by Eric Wong . - -Documentation -------------- -Written by Eric Wong . +GIT +--- +Part of the linkgit:git[1] suite