1git-svn(1) 2========== 3 4NAME 5---- 6git-svn - bidirectional operation between a single Subversion branch and git 7 8SYNOPSIS 9-------- 10'git-svn' <command> [options] [arguments] 11 12DESCRIPTION 13----------- 14git-svn is a simple conduit for changesets between a single Subversion 15branch and git. It is not to be confused with gitlink:git-svnimport[1]. 16They were designed with very different goals in mind. 17 18git-svn is designed for an individual developer who wants a 19bidirectional flow of changesets between a single branch in Subversion 20and an arbitrary number of branches in git. git-svnimport is designed 21for read-only operation on repositories that match a particular layout 22(albeit the recommended one by SVN developers). 23 24For importing svn, git-svnimport is potentially more powerful when 25operating on repositories organized under the recommended 26trunk/branch/tags structure, and should be faster, too. 27 28git-svn mostly ignores the very limited view of branching that 29Subversion has. This allows git-svn to be much easier to use, 30especially on repositories that are not organized in a manner that 31git-svnimport is designed for. 32 33COMMANDS 34-------- 35-- 36 37'init':: 38 Creates an empty git repository with additional metadata 39 directories for git-svn. The Subversion URL must be specified 40 as a command-line argument. 41 42'fetch':: 43 44Fetch unfetched revisions from the Subversion URL we are 45tracking. refs/remotes/git-svn will be updated to the 46latest revision. 47 48Note: You should never attempt to modify the remotes/git-svn 49branch outside of git-svn. Instead, create a branch from 50remotes/git-svn and work on that branch. Use the 'commit' 51command (see below) to write git commits back to 52remotes/git-svn. 53 54See '<<fetch-args,Additional Fetch Arguments>>' if you are interested in 55manually joining branches on commit. 56 57'commit':: 58 Commit specified commit or tree objects to SVN. This relies on 59 your imported fetch data being up-to-date. This makes 60 absolutely no attempts to do patching when committing to SVN, it 61 simply overwrites files with those specified in the tree or 62 commit. All merging is assumed to have taken place 63 independently of git-svn functions. 64 65'rebuild':: 66 Not a part of daily usage, but this is a useful command if 67 you've just cloned a repository (using gitlink:git-clone[1]) that was 68 tracked with git-svn. Unfortunately, git-clone does not clone 69 git-svn metadata and the svn working tree that git-svn uses for 70 its operations. This rebuilds the metadata so git-svn can 71 resume fetch operations. A Subversion URL may be optionally 72 specified at the command-line if the directory/repository you're 73 tracking has moved or changed protocols. 74 75'show-ignore':: 76 Recursively finds and lists the svn:ignore property on 77 directories. The output is suitable for appending to 78 the $GIT_DIR/info/exclude file. 79 80-- 81 82OPTIONS 83------- 84-- 85 86-r <ARG>:: 87--revision <ARG>:: 88 89Only used with the 'fetch' command. 90 91Takes any valid -r<argument> svn would accept and passes it 92directly to svn. -r<ARG1>:<ARG2> ranges and "{" DATE "}" syntax 93is also supported. This is passed directly to svn, see svn 94documentation for more details. 95 96This can allow you to make partial mirrors when running fetch. 97 98-:: 99--stdin:: 100 101Only used with the 'commit' command. 102 103Read a list of commits from stdin and commit them in reverse 104order. Only the leading sha1 is read from each line, so 105git-rev-list --pretty=oneline output can be used. 106 107--rmdir:: 108 109Only used with the 'commit' command. 110 111Remove directories from the SVN tree if there are no files left 112behind. SVN can version empty directories, and they are not 113removed by default if there are no files left in them. git 114cannot version empty directories. Enabling this flag will make 115the commit to SVN act like git. 116 117repo-config key: svn.rmdir 118 119-e:: 120--edit:: 121 122Only used with the 'commit' command. 123 124Edit the commit message before committing to SVN. This is off by 125default for objects that are commits, and forced on when committing 126tree objects. 127 128repo-config key: svn.edit 129 130-l<num>:: 131--find-copies-harder:: 132 133Both of these are only used with the 'commit' command. 134 135They are both passed directly to git-diff-tree see 136gitlink:git-diff-tree[1] for more information. 137 138[verse] 139repo-config key: svn.l 140repo-config key: svn.findcopiesharder 141 142-A<filename>:: 143--authors-file=<filename>:: 144 145Syntax is compatible with the files used by git-svnimport and 146git-cvsimport: 147 148------------------------------------------------------------------------ 149 loginname = Joe User <user@example.com> 150------------------------------------------------------------------------ 151 152If this option is specified and git-svn encounters an SVN 153committer name that does not exist in the authors-file, git-svn 154will abort operation. The user will then have to add the 155appropriate entry. Re-running the previous git-svn command 156after the authors-file is modified should continue operation. 157 158repo-config key: svn.authors-file 159 160-- 161 162ADVANCED OPTIONS 163---------------- 164-- 165 166-b<refname>:: 167--branch <refname>:: 168Used with 'fetch' or 'commit'. 169 170This can be used to join arbitrary git branches to remotes/git-svn 171on new commits where the tree object is equivalent. 172 173When used with different GIT_SVN_ID values, tags and branches in 174SVN can be tracked this way, as can some merges where the heads 175end up having completely equivalent content. This can even be 176used to track branches across multiple SVN _repositories_. 177 178This option may be specified multiple times, once for each 179branch. 180 181repo-config key: svn.branch 182 183-i<GIT_SVN_ID>:: 184--id <GIT_SVN_ID>:: 185 186This sets GIT_SVN_ID (instead of using the environment). See the 187section on 188'<<tracking-multiple-repos,Tracking Multiple Repositories or Branches>>' 189for more information on using GIT_SVN_ID. 190 191-- 192 193COMPATIBILITY OPTIONS 194--------------------- 195-- 196 197--upgrade:: 198Only used with the 'rebuild' command. 199 200Run this if you used an old version of git-svn that used 201"git-svn-HEAD" instead of "remotes/git-svn" as the branch 202for tracking the remote. 203 204--no-ignore-externals:: 205Only used with the 'fetch' and 'rebuild' command. 206 207By default, git-svn passes --ignore-externals to svn to avoid 208fetching svn:external trees into git. Pass this flag to enable 209externals tracking directly via git. 210 211Versions of svn that do not support --ignore-externals are 212automatically detected and this flag will be automatically 213enabled for them. 214 215Otherwise, do not enable this flag unless you know what you're 216doing. 217 218repo-config key: svn.noignoreexternals 219 220-- 221 222Basic Examples 223~~~~~~~~~~~~~~ 224 225Tracking and contributing to an Subversion managed-project: 226 227------------------------------------------------------------------------ 228# Initialize a tree (like git init-db): 229 git-svn init http://svn.foo.org/project/trunk 230# Fetch remote revisions: 231 git-svn fetch 232# Create your own branch to hack on: 233 git checkout -b my-branch remotes/git-svn 234# Commit only the git commits you want to SVN: 235 git-svn commit <tree-ish> [<tree-ish_2> ...] 236# Commit all the git commits from my-branch that don't exist in SVN: 237 git-svn commit remotes/git-svn..my-branch 238# Something is committed to SVN, rebase the latest into your branch: 239 git-svn fetch && git rebase remotes/git-svn 240# Append svn:ignore settings to the default git exclude file: 241 git-svn show-ignore >> .git/info/exclude 242------------------------------------------------------------------------ 243 244REBASE VS. PULL 245--------------- 246 247Originally, git-svn recommended that the remotes/git-svn branch be 248pulled from. This is because the author favored 'git-svn commit B' 249to commit a single head rather than the 'git-svn commit A..B' notation 250to commit multiple commits. 251 252If you use 'git-svn commit A..B' to commit several diffs and you do not 253have the latest remotes/git-svn merged into my-branch, you should use 254'git rebase' to update your work branch instead of 'git pull'. 'pull' 255can cause non-linear history to be flattened when committing into SVN, 256which can lead to merge commits reversing previous commits in SVN. 257 258DESIGN PHILOSOPHY 259----------------- 260Merge tracking in Subversion is lacking and doing branched development 261with Subversion is cumbersome as a result. git-svn completely forgoes 262any automated merge/branch tracking on the Subversion side and leaves it 263entirely up to the user on the git side. It's simply not worth it to do 264a useful translation when the original signal is weak. 265 266[[tracking-multiple-repos]] 267TRACKING MULTIPLE REPOSITORIES OR BRANCHES 268------------------------------------------ 269This is for advanced users, most users should ignore this section. 270 271Because git-svn does not care about relationships between different 272branches or directories in a Subversion repository, git-svn has a simple 273hack to allow it to track an arbitrary number of related _or_ unrelated 274SVN repositories via one git repository. Simply set the GIT_SVN_ID 275environment variable to a name other other than "git-svn" (the default) 276and git-svn will ignore the contents of the $GIT_DIR/git-svn directory 277and instead do all of its work in $GIT_DIR/$GIT_SVN_ID for that 278invocation. The interface branch will be remotes/$GIT_SVN_ID, instead of 279remotes/git-svn. Any remotes/$GIT_SVN_ID branch should never be modified 280by the user outside of git-svn commands. 281 282[[fetch-args]] 283ADDITIONAL FETCH ARGUMENTS 284-------------------------- 285This is for advanced users, most users should ignore this section. 286 287Unfetched SVN revisions may be imported as children of existing commits 288by specifying additional arguments to 'fetch'. Additional parents may 289optionally be specified in the form of sha1 hex sums at the 290command-line. Unfetched SVN revisions may also be tied to particular 291git commits with the following syntax: 292 293------------------------------------------------ 294 svn_revision_number=git_commit_sha1 295------------------------------------------------ 296 297This allows you to tie unfetched SVN revision 375 to your current HEAD: 298 299------------------------------------------------ 300 git-svn fetch 375=$(git-rev-parse HEAD) 301------------------------------------------------ 302 303Advanced Example: Tracking a Reorganized Repository 304~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 305If you're tracking a directory that has moved, or otherwise been 306branched or tagged off of another directory in the repository and you 307care about the full history of the project, then you can read this 308section. 309 310This is how Yann Dirson tracked the trunk of the ufoai directory when 311the /trunk directory of his repository was moved to /ufoai/trunk and 312he needed to continue tracking /ufoai/trunk where /trunk left off. 313 314------------------------------------------------------------------------ 315 # This log message shows when the repository was reorganized: 316 r166 | ydirson | 2006-03-02 01:36:55 +0100 (Thu, 02 Mar 2006) | 1 line 317 Changed paths: 318 D /trunk 319 A /ufoai/trunk (from /trunk:165) 320 321 # First we start tracking the old revisions: 322 GIT_SVN_ID=git-oldsvn git-svn init \ 323 https://svn.sourceforge.net/svnroot/ufoai/trunk 324 GIT_SVN_ID=git-oldsvn git-svn fetch -r1:165 325 326 # And now, we continue tracking the new revisions: 327 GIT_SVN_ID=git-newsvn git-svn init \ 328 https://svn.sourceforge.net/svnroot/ufoai/ufoai/trunk 329 GIT_SVN_ID=git-newsvn git-svn fetch \ 330 166=`git-rev-parse refs/remotes/git-oldsvn` 331------------------------------------------------------------------------ 332 333BUGS 334---- 335If somebody commits a conflicting changeset to SVN at a bad moment 336(right before you commit) causing a conflict and your commit to fail, 337your svn working tree ($GIT_DIR/git-svn/tree) may be dirtied. The 338easiest thing to do is probably just to rm -rf $GIT_DIR/git-svn/tree and 339run 'rebuild'. 340 341We ignore all SVN properties except svn:executable. Too difficult to 342map them since we rely heavily on git write-tree being _exactly_ the 343same on both the SVN and git working trees and I prefer not to clutter 344working trees with metadata files. 345 346svn:keywords can't be ignored in Subversion (at least I don't know of 347a way to ignore them). 348 349Renamed and copied directories are not detected by git and hence not 350tracked when committing to SVN. I do not plan on adding support for 351this as it's quite difficult and time-consuming to get working for all 352the possible corner cases (git doesn't do it, either). Renamed and 353copied files are fully supported if they're similar enough for git to 354detect them. 355 356SEE ALSO 357-------- 358gitlink:git-rebase[1] 359 360Author 361------ 362Written by Eric Wong <normalperson@yhbt.net>. 363 364Documentation 365------------- 366Written by Eric Wong <normalperson@yhbt.net>.