]>
Commit | Line | Data |
---|---|---|
3397f9df EW |
1 | git-svn(1) |
2 | ========== | |
3 | ||
4 | NAME | |
5 | ---- | |
c3f0baac | 6 | git-svn - Bidirectional operation between a single Subversion branch and git |
3397f9df EW |
7 | |
8 | SYNOPSIS | |
9 | -------- | |
b1889c36 | 10 | 'git svn' <command> [options] [arguments] |
3397f9df EW |
11 | |
12 | DESCRIPTION | |
13 | ----------- | |
ba020ef5 | 14 | 'git-svn' is a simple conduit for changesets between Subversion and git. |
8cb070a4 | 15 | It provides a bidirectional flow of changes between a Subversion and a git |
1168d402 | 16 | repository. |
3397f9df | 17 | |
8cb070a4 BG |
18 | 'git-svn' can track a single Subversion branch simply by using a |
19 | URL to the branch, follow branches laid out in the Subversion recommended | |
20 | method (trunk, branches, tags directories) with the --stdlayout option, or | |
21 | follow branches in any layout with the -T/-t/-b options (see options to | |
22 | 'init' below, and also the 'clone' command). | |
3397f9df | 23 | |
8cb070a4 BG |
24 | Once tracking a Subversion branch (with any of the above methods), the git |
25 | repository can be updated from Subversion by the 'fetch' command and | |
26 | Subversion updated from git by the 'dcommit' command. | |
3397f9df EW |
27 | |
28 | COMMANDS | |
29 | -------- | |
0ea4d4c9 JF |
30 | -- |
31 | ||
32 | 'init':: | |
a836a0e1 | 33 | Initializes an empty git repository with additional |
ba020ef5 | 34 | metadata directories for 'git-svn'. The Subversion URL |
a836a0e1 EW |
35 | may be specified as a command-line argument, or as full |
36 | URL arguments to -T/-t/-b. Optionally, the target | |
37 | directory to operate on can be specified as a second | |
38 | argument. Normally this command initializes the current | |
39 | directory. | |
3397f9df | 40 | |
cc1793e2 KW |
41 | -T<trunk_subdir>;; |
42 | --trunk=<trunk_subdir>;; | |
43 | -t<tags_subdir>;; | |
44 | --tags=<tags_subdir>;; | |
45 | -b<branches_subdir>;; | |
46 | --branches=<branches_subdir>;; | |
8f728fb9 | 47 | -s;; |
48 | --stdlayout;; | |
a836a0e1 EW |
49 | These are optional command-line options for init. Each of |
50 | these flags can point to a relative repository path | |
51 | (--tags=project/tags') or a full url | |
8f728fb9 | 52 | (--tags=https://foo.org/project/tags). The option --stdlayout is |
53 | a shorthand way of setting trunk,tags,branches as the relative paths, | |
54 | which is the Subversion default. If any of the other options are given | |
55 | as well, they take precedence. | |
cc1793e2 | 56 | --no-metadata;; |
0dfaf0a4 | 57 | Set the 'noMetadata' option in the [svn-remote] config. |
cc1793e2 | 58 | --use-svm-props;; |
0dfaf0a4 | 59 | Set the 'useSvmProps' option in the [svn-remote] config. |
cc1793e2 | 60 | --use-svnsync-props;; |
0dfaf0a4 | 61 | Set the 'useSvnsyncProps' option in the [svn-remote] config. |
cc1793e2 | 62 | --rewrite-root=<URL>;; |
0dfaf0a4 | 63 | Set the 'rewriteRoot' option in the [svn-remote] config. |
de451dff AP |
64 | --use-log-author;; |
65 | When retrieving svn commits into git (as part of fetch, rebase, or | |
66 | dcommit operations), look for the first From: or Signed-off-by: line | |
67 | in the log message and use that as the author string. | |
9e72732e AP |
68 | --add-author-from;; |
69 | When committing to svn from git (as part of commit or dcommit | |
70 | operations), if the existing log message doesn't already have a | |
71 | From: or Signed-off-by: line, append a From: line based on the | |
72 | git commit's author string. If you use this, then --use-log-author | |
73 | will retrieve a valid author string for all commits. | |
cc1793e2 | 74 | --username=<USER>;; |
a0d7fe3f SV |
75 | For transports that SVN handles authentication for (http, |
76 | https, and plain svn), specify the username. For other | |
77 | transports (eg svn+ssh://), you must include the username in | |
78 | the URL, eg svn+ssh://foo@svn.bar.com/project | |
cc1793e2 | 79 | --prefix=<prefix>;; |
a836a0e1 EW |
80 | This allows one to specify a prefix which is prepended |
81 | to the names of remotes if trunk/branches/tags are | |
82 | specified. The prefix does not automatically include a | |
83 | trailing slash, so be sure you include one in the | |
0d351e9c GP |
84 | argument if that is what you want. If --branches/-b is |
85 | specified, the prefix must include a trailing slash. | |
86 | Setting a prefix is useful if you wish to track multiple | |
87 | projects that share a common repository. | |
88ec2054 BJ |
88 | --ignore-paths=<regex>;; |
89 | When passed to 'init' or 'clone' this regular expression will | |
90 | be preserved as a config key. See 'fetch' for a description | |
91 | of '--ignore-paths'. | |
81c5a0e6 | 92 | |
a836a0e1 | 93 | 'fetch':: |
a836a0e1 EW |
94 | Fetch unfetched revisions from the Subversion remote we are |
95 | tracking. The name of the [svn-remote "..."] section in the | |
96 | .git/config file may be specified as an optional command-line | |
97 | argument. | |
b705ba43 | 98 | |
e82f0d73 PH |
99 | --localtime;; |
100 | Store Git commit times in the local timezone instead of UTC. This | |
101 | makes 'git-log' (even without --date=local) show the same times | |
102 | that `svn log` would in the local timezone. | |
103 | ||
c2abd83f JM |
104 | --parent;; |
105 | Fetch only from the SVN parent of the current HEAD. | |
106 | ||
e82f0d73 PH |
107 | This doesn't interfere with interoperating with the Subversion |
108 | repository you cloned from, but if you wish for your local Git | |
109 | repository to be able to interoperate with someone else's local Git | |
110 | repository, either don't use this option or you should both use it in | |
111 | the same local timezone. | |
112 | ||
6076b843 | 113 | --ignore-paths=<regex>;; |
0d8bee71 | 114 | This allows one to specify a Perl regular expression that will |
6076b843 | 115 | cause skipping of all matching paths from checkout from SVN. |
0d8bee71 BJ |
116 | The '--ignore-paths' option should match for every 'fetch' |
117 | (including automatic fetches due to 'clone', 'dcommit', | |
118 | 'rebase', etc) on a given repository. | |
6076b843 | 119 | |
0d8bee71 | 120 | config key: svn-remote.<name>.ignore-paths |
6076b843 | 121 | |
0d8bee71 BJ |
122 | If the ignore-paths config key is set and the command |
123 | line option is also given, both regular expressions | |
124 | will be used. | |
6076b843 | 125 | |
0d8bee71 BJ |
126 | Examples: |
127 | ||
128 | --ignore-paths="^doc" - skip "doc*" directory for every | |
129 | fetch. | |
130 | ||
131 | --ignore-paths="^[^/]+/(?:branches|tags)" - skip | |
132 | "branches" and "tags" of first level directories. | |
6076b843 | 133 | |
a81ed0b6 EW |
134 | 'clone':: |
135 | Runs 'init' and 'fetch'. It will automatically create a | |
136 | directory based on the basename of the URL passed to it; | |
137 | or if a second argument is passed; it will create a directory | |
138 | and work within that. It accepts all arguments that the | |
139 | 'init' and 'fetch' commands accept; with the exception of | |
140 | '--fetch-all'. After a repository is cloned, the 'fetch' | |
141 | command will be able to update revisions without affecting | |
142 | the working tree; and the 'rebase' command will be able | |
143 | to update the working tree with the latest changes. | |
144 | ||
145 | 'rebase':: | |
146 | This fetches revisions from the SVN parent of the current HEAD | |
147 | and rebases the current (uncommitted to SVN) work against it. | |
148 | ||
ba020ef5 JN |
149 | This works similarly to `svn update` or 'git-pull' except that |
150 | it preserves linear history with 'git-rebase' instead of | |
a0178ae2 | 151 | 'git-merge' for ease of dcommitting with 'git-svn'. |
a81ed0b6 | 152 | |
ba020ef5 | 153 | This accepts all options that 'git-svn fetch' and 'git-rebase' |
483bc4f0 | 154 | accept. However, '--fetch-all' only fetches from the current |
112f6385 | 155 | [svn-remote], and not all [svn-remote] definitions. |
a81ed0b6 | 156 | |
ba020ef5 | 157 | Like 'git-rebase'; this requires that the working tree be clean |
112f6385 | 158 | and have no uncommitted changes. |
cc1793e2 | 159 | |
dee41f3e EW |
160 | -l;; |
161 | --local;; | |
ba020ef5 | 162 | Do not fetch remotely; only run 'git-rebase' against the |
dee41f3e | 163 | last fetched commit from the upstream SVN. |
a81ed0b6 | 164 | |
b22d4497 | 165 | 'dcommit':: |
2eff1425 | 166 | Commit each diff from a specified head directly to the SVN |
b22d4497 | 167 | repository, and then rebase or reset (depending on whether or |
2eff1425 EW |
168 | not there is a diff between SVN and head). This will create |
169 | a revision in SVN for each commit in git. | |
ba020ef5 | 170 | It is recommended that you run 'git-svn' fetch and rebase (not |
2eff1425 EW |
171 | pull or merge) your commits against the latest changes in the |
172 | SVN repository. | |
5eec27e3 TR |
173 | An optional revision or branch argument may be specified, and |
174 | causes 'git-svn' to do all work on that revision/branch | |
175 | instead of HEAD. | |
3289e86e | 176 | This is advantageous over 'set-tree' (below) because it produces |
b22d4497 | 177 | cleaner, more linear history. |
171af110 KW |
178 | + |
179 | --no-rebase;; | |
180 | After committing, do not rebase or reset. | |
ba24e745 EW |
181 | --commit-url <URL>;; |
182 | Commit to this SVN URL (the full path). This is intended to | |
183 | allow existing git-svn repositories created with one transport | |
184 | method (e.g. `svn://` or `http://` for anonymous read) to be | |
185 | reused if a user is later given access to an alternate transport | |
186 | method (e.g. `svn+ssh://` or `https://`) for commit. | |
187 | ||
0df84059 PO |
188 | config key: svn-remote.<name>.commiturl |
189 | ||
190 | config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options) | |
191 | ||
ba24e745 EW |
192 | Using this option for any other purpose (don't ask) |
193 | is very strongly discouraged. | |
112f6385 | 194 | -- |
b22d4497 | 195 | |
5de70efb FR |
196 | 'branch':: |
197 | Create a branch in the SVN repository. | |
198 | ||
199 | -m;; | |
200 | --message;; | |
201 | Allows to specify the commit message. | |
202 | ||
203 | -t;; | |
204 | --tag;; | |
205 | Create a tag by using the tags_subdir instead of the branches_subdir | |
206 | specified during git svn init. | |
207 | ||
208 | 'tag':: | |
209 | Create a tag in the SVN repository. This is a shorthand for | |
210 | 'branch -t'. | |
211 | ||
e8f5d908 EW |
212 | 'log':: |
213 | This should make it easy to look up svn log messages when svn | |
214 | users refer to -r/--revision numbers. | |
112f6385 SV |
215 | + |
216 | The following features from `svn log' are supported: | |
217 | + | |
218 | -- | |
195643f2 | 219 | -r/--revision=<n>[:<n>];; |
112f6385 SV |
220 | is supported, non-numeric args are not: |
221 | HEAD, NEXT, BASE, PREV, etc ... | |
222 | -v/--verbose;; | |
223 | it's not completely compatible with the --verbose | |
224 | output in svn log, but reasonably close. | |
225 | --limit=<n>;; | |
226 | is NOT the same as --max-count, doesn't count | |
227 | merged/excluded commits | |
228 | --incremental;; | |
229 | supported | |
230 | -- | |
231 | + | |
232 | New features: | |
233 | + | |
234 | -- | |
235 | --show-commit;; | |
236 | shows the git commit sha1, as well | |
237 | --oneline;; | |
238 | our version of --pretty=oneline | |
239 | -- | |
240 | + | |
a50a5c8f MV |
241 | NOTE: SVN itself only stores times in UTC and nothing else. The regular svn |
242 | client converts the UTC time to the local time (or based on the TZ= | |
243 | environment). This command has the same behaviour. | |
244 | + | |
ba020ef5 | 245 | Any other arguments are passed directly to 'git-log' |
e8f5d908 | 246 | |
6fb5375e | 247 | 'blame':: |
4be40381 SG |
248 | Show what revision and author last modified each line of a file. The |
249 | output of this mode is format-compatible with the output of | |
250 | `svn blame' by default. Like the SVN blame command, | |
251 | local uncommitted changes in the working copy are ignored; | |
252 | the version of the file in the HEAD revision is annotated. Unknown | |
ba020ef5 | 253 | arguments are passed directly to 'git-blame'. |
6fb5375e | 254 | + |
4be40381 | 255 | --git-format;; |
ba020ef5 | 256 | Produce output in the same format as 'git-blame', but with |
4be40381 SG |
257 | SVN revision numbers instead of git commit hashes. In this mode, |
258 | changes that haven't been committed to SVN (including local | |
259 | working-copy edits) are shown as revision 0. | |
6fb5375e | 260 | |
112f6385 | 261 | -- |
26e60160 AR |
262 | 'find-rev':: |
263 | When given an SVN revision number of the form 'rN', returns the | |
b3cb7e45 AR |
264 | corresponding git commit hash (this can optionally be followed by a |
265 | tree-ish to specify which branch should be searched). When given a | |
266 | tree-ish, returns the corresponding SVN revision number. | |
26e60160 | 267 | |
3289e86e | 268 | 'set-tree':: |
e8f5d908 | 269 | You should consider using 'dcommit' instead of this command. |
3397f9df EW |
270 | Commit specified commit or tree objects to SVN. This relies on |
271 | your imported fetch data being up-to-date. This makes | |
272 | absolutely no attempts to do patching when committing to SVN, it | |
273 | simply overwrites files with those specified in the tree or | |
274 | commit. All merging is assumed to have taken place | |
ba020ef5 | 275 | independently of 'git-svn' functions. |
3397f9df | 276 | |
da060c67 | 277 | 'create-ignore':: |
da060c67 GH |
278 | Recursively finds the svn:ignore property on directories and |
279 | creates matching .gitignore files. The resulting files are staged to | |
69239728 | 280 | be committed, but are not committed. Use -r/--revision to refer to a |
1168d402 | 281 | specific revision. |
da060c67 | 282 | |
0ea4d4c9 | 283 | 'show-ignore':: |
8f22562c EW |
284 | Recursively finds and lists the svn:ignore property on |
285 | directories. The output is suitable for appending to | |
286 | the $GIT_DIR/info/exclude file. | |
287 | ||
e8f5d908 EW |
288 | 'commit-diff':: |
289 | Commits the diff of two tree-ish arguments from the | |
8cb070a4 | 290 | command-line. This command does not rely on being inside an `git-svn |
483bc4f0 | 291 | init`-ed repository. This command takes three arguments, (a) the |
e8f5d908 EW |
292 | original tree to diff against, (b) the new tree result, (c) the |
293 | URL of the target Subversion repository. The final argument | |
ba020ef5 JN |
294 | (URL) may be omitted if you are working from a 'git-svn'-aware |
295 | repository (that has been `init`-ed with 'git-svn'). | |
45bf473a | 296 | The -r<revision> option is required for this. |
e8f5d908 | 297 | |
e6fefa92 DK |
298 | 'info':: |
299 | Shows information about a file or directory similar to what | |
300 | `svn info' provides. Does not currently support a -r/--revision | |
8b014d71 DK |
301 | argument. Use the --url option to output only the value of the |
302 | 'URL:' field. | |
e6fefa92 | 303 | |
69239728 GH |
304 | 'proplist':: |
305 | Lists the properties stored in the Subversion repository about a | |
306 | given file or directory. Use -r/--revision to refer to a specific | |
307 | Subversion revision. | |
308 | ||
309 | 'propget':: | |
310 | Gets the Subversion property given as the first argument, for a | |
311 | file. A specific revision can be specified with -r/--revision. | |
312 | ||
313 | 'show-externals':: | |
314 | Shows the Subversion externals. Use -r/--revision to specify a | |
315 | specific revision. | |
316 | ||
195643f2 BJ |
317 | 'reset':: |
318 | Undoes the effects of 'fetch' back to the specified revision. | |
319 | This allows you to re-'fetch' an SVN revision. Normally the | |
320 | contents of an SVN revision should never change and 'reset' | |
321 | should not be necessary. However, if SVN permissions change, | |
322 | or if you alter your --ignore-paths option, a 'fetch' may fail | |
323 | with "not found in commit" (file not previously visible) or | |
324 | "checksum mismatch" (missed a modification). If the problem | |
325 | file cannot be ignored forever (with --ignore-paths) the only | |
326 | way to repair the repo is to use 'reset'. | |
327 | ||
328 | Only the rev_map and refs/remotes/git-svn are changed. Follow 'reset' | |
329 | with a 'fetch' and then 'git-reset' or 'git-rebase' to move local | |
330 | branches onto the new tree. | |
331 | ||
332 | -r/--revision=<n>;; | |
333 | Specify the most recent revision to keep. All later revisions | |
334 | are discarded. | |
335 | -p/--parent;; | |
336 | Discard the specified revision as well, keeping the nearest | |
337 | parent instead. | |
338 | Example:;; | |
339 | Assume you have local changes in "master", but you need to refetch "r2". | |
340 | ||
341 | ------------ | |
342 | r1---r2---r3 remotes/git-svn | |
343 | \ | |
344 | A---B master | |
345 | ------------ | |
346 | ||
347 | Fix the ignore-paths or SVN permissions problem that caused "r2" to | |
348 | be incomplete in the first place. Then: | |
349 | ||
350 | [verse] | |
351 | git svn reset -r2 -p | |
352 | git svn fetch | |
353 | ||
354 | ------------ | |
355 | r1---r2'--r3' remotes/git-svn | |
356 | \ | |
357 | r2---r3---A---B master | |
358 | ------------ | |
359 | ||
360 | Then fixup "master" with 'git-rebase'. | |
361 | Do NOT use 'git-merge' or your history will not be compatible with a | |
362 | future 'dcommit'! | |
363 | ||
364 | [verse] | |
365 | git rebase --onto remotes/git-svn A^ master | |
366 | ||
367 | ------------ | |
368 | r1---r2'--r3' remotes/git-svn | |
369 | \ | |
370 | A'--B' master | |
371 | ------------ | |
372 | ||
373 | ||
0ea4d4c9 JF |
374 | -- |
375 | ||
3397f9df EW |
376 | OPTIONS |
377 | ------- | |
0ea4d4c9 JF |
378 | -- |
379 | ||
a836a0e1 | 380 | --shared[={false|true|umask|group|all|world|everybody}]:: |
e8f5d908 EW |
381 | --template=<template_directory>:: |
382 | Only used with the 'init' command. | |
ba020ef5 | 383 | These are passed directly to 'git-init'. |
e8f5d908 | 384 | |
3397f9df EW |
385 | -r <ARG>:: |
386 | --revision <ARG>:: | |
3397f9df | 387 | |
a836a0e1 | 388 | Used with the 'fetch' command. |
0ea4d4c9 | 389 | |
a836a0e1 EW |
390 | This allows revision ranges for partial/cauterized history |
391 | to be supported. $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges), | |
392 | $NUMBER:HEAD, and BASE:$NUMBER are all supported. | |
3397f9df | 393 | |
a836a0e1 EW |
394 | This can allow you to make partial mirrors when running fetch; |
395 | but is generally not recommended because history will be skipped | |
396 | and lost. | |
3397f9df EW |
397 | |
398 | -:: | |
399 | --stdin:: | |
3397f9df | 400 | |
3289e86e | 401 | Only used with the 'set-tree' command. |
0ea4d4c9 JF |
402 | |
403 | Read a list of commits from stdin and commit them in reverse | |
404 | order. Only the leading sha1 is read from each line, so | |
ba020ef5 | 405 | 'git-rev-list --pretty=oneline' output can be used. |
3397f9df EW |
406 | |
407 | --rmdir:: | |
3397f9df | 408 | |
3289e86e | 409 | Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands. |
0ea4d4c9 JF |
410 | |
411 | Remove directories from the SVN tree if there are no files left | |
412 | behind. SVN can version empty directories, and they are not | |
413 | removed by default if there are no files left in them. git | |
414 | cannot version empty directories. Enabling this flag will make | |
415 | the commit to SVN act like git. | |
3397f9df | 416 | |
e0d10e1c | 417 | config key: svn.rmdir |
20b1d700 | 418 | |
3397f9df EW |
419 | -e:: |
420 | --edit:: | |
3397f9df | 421 | |
3289e86e | 422 | Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands. |
3397f9df | 423 | |
0ea4d4c9 JF |
424 | Edit the commit message before committing to SVN. This is off by |
425 | default for objects that are commits, and forced on when committing | |
426 | tree objects. | |
427 | ||
e0d10e1c | 428 | config key: svn.edit |
20b1d700 | 429 | |
72942938 EW |
430 | -l<num>:: |
431 | --find-copies-harder:: | |
72942938 | 432 | |
3289e86e | 433 | Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands. |
0ea4d4c9 | 434 | |
ba020ef5 | 435 | They are both passed directly to 'git-diff-tree'; see |
5162e697 | 436 | linkgit:git-diff-tree[1] for more information. |
72942938 | 437 | |
0ea4d4c9 | 438 | [verse] |
e0d10e1c TP |
439 | config key: svn.l |
440 | config key: svn.findcopiesharder | |
20b1d700 | 441 | |
81c5a0e6 EW |
442 | -A<filename>:: |
443 | --authors-file=<filename>:: | |
444 | ||
8cb070a4 | 445 | Syntax is compatible with the file used by 'git-cvsimport': |
81c5a0e6 EW |
446 | |
447 | ------------------------------------------------------------------------ | |
0ea4d4c9 | 448 | loginname = Joe User <user@example.com> |
81c5a0e6 EW |
449 | ------------------------------------------------------------------------ |
450 | ||
ba020ef5 JN |
451 | If this option is specified and 'git-svn' encounters an SVN |
452 | committer name that does not exist in the authors-file, 'git-svn' | |
0ea4d4c9 | 453 | will abort operation. The user will then have to add the |
ba020ef5 | 454 | appropriate entry. Re-running the previous 'git-svn' command |
0ea4d4c9 | 455 | after the authors-file is modified should continue operation. |
81c5a0e6 | 456 | |
e0d10e1c | 457 | config key: svn.authorsfile |
e8f5d908 | 458 | |
36db1edd ML |
459 | --authors-prog=<filename>:: |
460 | ||
461 | If this option is specified, for each SVN committer name that does not | |
462 | exist in the authors file, the given file is executed with the committer | |
463 | name as the first argument. The program is expected to return a single | |
464 | line of the form "Name <email>", which will be treated as if included in | |
465 | the authors file. | |
466 | ||
e8f5d908 EW |
467 | -q:: |
468 | --quiet:: | |
49750f30 SA |
469 | Make 'git-svn' less verbose. Specify a second time to make it |
470 | even less verbose. | |
e8f5d908 EW |
471 | |
472 | --repack[=<n>]:: | |
112f6385 SV |
473 | --repack-flags=<flags>:: |
474 | ||
475 | These should help keep disk usage sane for large fetches | |
476 | with many revisions. | |
e8f5d908 | 477 | |
112f6385 SV |
478 | --repack takes an optional argument for the number of revisions |
479 | to fetch before repacking. This defaults to repacking every | |
480 | 1000 commits fetched if no argument is specified. | |
e8f5d908 | 481 | |
ba020ef5 | 482 | --repack-flags are passed directly to 'git-repack'. |
e8f5d908 | 483 | |
112f6385 | 484 | [verse] |
e0d10e1c TP |
485 | config key: svn.repack |
486 | config key: svn.repackflags | |
0ea4d4c9 | 487 | |
b22d4497 EW |
488 | -m:: |
489 | --merge:: | |
490 | -s<strategy>:: | |
491 | --strategy=<strategy>:: | |
492 | ||
a81ed0b6 | 493 | These are only used with the 'dcommit' and 'rebase' commands. |
b22d4497 | 494 | |
ba020ef5 JN |
495 | Passed directly to 'git-rebase' when using 'dcommit' if a |
496 | 'git-reset' cannot be used (see 'dcommit'). | |
b22d4497 EW |
497 | |
498 | -n:: | |
499 | --dry-run:: | |
500 | ||
5de70efb FR |
501 | This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' |
502 | commands. | |
b22d4497 | 503 | |
7d45e146 | 504 | For 'dcommit', print out the series of git arguments that would show |
b22d4497 EW |
505 | which diffs would be committed to SVN. |
506 | ||
7d45e146 SF |
507 | For 'rebase', display the local branch associated with the upstream svn |
508 | repository associated with the current branch and the URL of svn | |
509 | repository that will be fetched from. | |
510 | ||
5de70efb FR |
511 | For 'branch' and 'tag', display the urls that will be used for copying when |
512 | creating the branch or tag. | |
513 | ||
0ea4d4c9 | 514 | -- |
81c5a0e6 | 515 | |
448c81b4 EW |
516 | ADVANCED OPTIONS |
517 | ---------------- | |
0ea4d4c9 JF |
518 | -- |
519 | ||
448c81b4 EW |
520 | -i<GIT_SVN_ID>:: |
521 | --id <GIT_SVN_ID>:: | |
0ea4d4c9 | 522 | |
a836a0e1 EW |
523 | This sets GIT_SVN_ID (instead of using the environment). This |
524 | allows the user to override the default refname to fetch from | |
525 | when tracking a single URL. The 'log' and 'dcommit' commands | |
526 | no longer require this switch as an argument. | |
0ea4d4c9 | 527 | |
9760adcc EW |
528 | -R<remote name>:: |
529 | --svn-remote <remote name>:: | |
530 | Specify the [svn-remote "<remote name>"] section to use, | |
a836a0e1 EW |
531 | this allows SVN multiple repositories to be tracked. |
532 | Default: "svn" | |
9760adcc | 533 | |
e8f5d908 EW |
534 | --follow-parent:: |
535 | This is especially helpful when we're tracking a directory | |
536 | that has been moved around within the repository, or if we | |
537 | started tracking a branch and never tracked the trunk it was | |
0bed5eaa EW |
538 | descended from. This feature is enabled by default, use |
539 | --no-follow-parent to disable it. | |
e8f5d908 | 540 | |
e0d10e1c | 541 | config key: svn.followparent |
e8f5d908 | 542 | |
a81ed0b6 EW |
543 | -- |
544 | CONFIG FILE-ONLY OPTIONS | |
545 | ------------------------ | |
546 | -- | |
547 | ||
0dfaf0a4 EW |
548 | svn.noMetadata:: |
549 | svn-remote.<name>.noMetadata:: | |
e8f5d908 | 550 | |
483bc4f0 | 551 | This gets rid of the 'git-svn-id:' lines at the end of every commit. |
112f6385 | 552 | |
ba020ef5 | 553 | If you lose your .git/svn/git-svn/.rev_db file, 'git-svn' will not |
112f6385 SV |
554 | be able to rebuild it and you won't be able to fetch again, |
555 | either. This is fine for one-shot imports. | |
e8f5d908 | 556 | |
ba020ef5 | 557 | The 'git-svn log' command will not work on repositories using |
112f6385 SV |
558 | this, either. Using this conflicts with the 'useSvmProps' |
559 | option for (hopefully) obvious reasons. | |
97ae0911 | 560 | |
0dfaf0a4 EW |
561 | svn.useSvmProps:: |
562 | svn-remote.<name>.useSvmProps:: | |
97ae0911 | 563 | |
ba020ef5 | 564 | This allows 'git-svn' to re-map repository URLs and UUIDs from |
112f6385 SV |
565 | mirrors created using SVN::Mirror (or svk) for metadata. |
566 | ||
567 | If an SVN revision has a property, "svm:headrev", it is likely | |
568 | that the revision was created by SVN::Mirror (also used by SVK). | |
569 | The property contains a repository UUID and a revision. We want | |
570 | to make it look like we are mirroring the original URL, so | |
571 | introduce a helper function that returns the original identity | |
572 | URL and UUID, and use it when generating metadata in commit | |
573 | messages. | |
97ae0911 | 574 | |
0dfaf0a4 EW |
575 | svn.useSvnsyncProps:: |
576 | svn-remote.<name>.useSvnsyncprops:: | |
a81ed0b6 EW |
577 | Similar to the useSvmProps option; this is for users |
578 | of the svnsync(1) command distributed with SVN 1.4.x and | |
579 | later. | |
580 | ||
0dfaf0a4 | 581 | svn-remote.<name>.rewriteRoot:: |
a81ed0b6 | 582 | This allows users to create repositories from alternate |
ba020ef5 | 583 | URLs. For example, an administrator could run 'git-svn' on the |
a81ed0b6 EW |
584 | server locally (accessing via file://) but wish to distribute |
585 | the repository with a public http:// or svn:// URL in the | |
586 | metadata so users of it will see the public URL. | |
587 | ||
4c58a711 EW |
588 | svn.brokenSymlinkWorkaround:: |
589 | This disables potentially expensive checks to workaround broken symlinks | |
590 | checked into SVN by broken clients. Set this option to "false" if you | |
591 | track a SVN repository with many empty blobs that are not symlinks. | |
592 | This option may be changed while "git-svn" is running and take effect on | |
593 | the next revision fetched. If unset, git-svn assumes this option to be | |
594 | "true". | |
595 | ||
3b2bbe9b JK |
596 | -- |
597 | ||
a81ed0b6 | 598 | Since the noMetadata, rewriteRoot, useSvnsyncProps and useSvmProps |
ba020ef5 | 599 | options all affect the metadata generated and used by 'git-svn'; they |
a81ed0b6 EW |
600 | *must* be set in the configuration file before any history is imported |
601 | and these settings should never be changed once they are set. | |
602 | ||
603 | Additionally, only one of these four options can be used per-svn-remote | |
604 | section because they affect the 'git-svn-id:' metadata line. | |
e8f5d908 | 605 | |
448c81b4 | 606 | |
112f6385 SV |
607 | BASIC EXAMPLES |
608 | -------------- | |
3397f9df | 609 | |
06ada152 | 610 | Tracking and contributing to the trunk of a Subversion-managed project: |
3397f9df | 611 | |
20b1d700 | 612 | ------------------------------------------------------------------------ |
a81ed0b6 | 613 | # Clone a repo (like git clone): |
2670ddce | 614 | git svn clone http://svn.example.com/project/trunk |
a81ed0b6 EW |
615 | # Enter the newly cloned directory: |
616 | cd trunk | |
617 | # You should be on master branch, double-check with git-branch | |
618 | git branch | |
619 | # Do some work and commit locally to git: | |
620 | git commit ... | |
621 | # Something is committed to SVN, rebase your local changes against the | |
622 | # latest changes in SVN: | |
b1889c36 | 623 | git svn rebase |
a81ed0b6 EW |
624 | # Now commit your changes (that were committed previously using git) to SVN, |
625 | # as well as automatically updating your working HEAD: | |
b1889c36 | 626 | git svn dcommit |
20b1d700 | 627 | # Append svn:ignore settings to the default git exclude file: |
b1889c36 | 628 | git svn show-ignore >> .git/info/exclude |
20b1d700 | 629 | ------------------------------------------------------------------------ |
3397f9df | 630 | |
0d313b2b EW |
631 | Tracking and contributing to an entire Subversion-managed project |
632 | (complete with a trunk, tags and branches): | |
0d313b2b EW |
633 | |
634 | ------------------------------------------------------------------------ | |
a81ed0b6 | 635 | # Clone a repo (like git clone): |
2670ddce | 636 | git svn clone http://svn.example.com/project -T trunk -b branches -t tags |
a81ed0b6 EW |
637 | # View all branches and tags you have cloned: |
638 | git branch -r | |
5de70efb FR |
639 | # Create a new branch in SVN |
640 | git svn branch waldo | |
a81ed0b6 EW |
641 | # Reset your master to trunk (or any other branch, replacing 'trunk' |
642 | # with the appropriate name): | |
643 | git reset --hard remotes/trunk | |
644 | # You may only dcommit to one branch/tag/trunk at a time. The usage | |
20f50f16 | 645 | # of dcommit/rebase/show-ignore should be the same as above. |
0d313b2b EW |
646 | ------------------------------------------------------------------------ |
647 | ||
ba020ef5 | 648 | The initial 'git-svn clone' can be quite time-consuming |
7d4aef40 AR |
649 | (especially for large Subversion repositories). If multiple |
650 | people (or one person with multiple machines) want to use | |
ba020ef5 JN |
651 | 'git-svn' to interact with the same Subversion repository, you can |
652 | do the initial 'git-svn clone' to a repository on a server and | |
653 | have each person clone that repository with 'git-clone': | |
7d4aef40 AR |
654 | |
655 | ------------------------------------------------------------------------ | |
656 | # Do the initial import on a server | |
2670ddce | 657 | ssh server "cd /pub && git svn clone http://svn.example.com/project |
2b0d1033 SV |
658 | # Clone locally - make sure the refs/remotes/ space matches the server |
659 | mkdir project | |
660 | cd project | |
b1889c36 | 661 | git init |
2b0d1033 | 662 | git remote add origin server:/pub/project |
762656e0 | 663 | git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*' |
2b0d1033 | 664 | git fetch |
9e77353e JK |
665 | # Create a local branch from one of the branches just fetched |
666 | git checkout -b master FETCH_HEAD | |
7d4aef40 | 667 | # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server) |
2670ddce | 668 | git svn init http://svn.example.com/project |
7d4aef40 | 669 | # Pull the latest changes from Subversion |
b1889c36 | 670 | git svn rebase |
7d4aef40 AR |
671 | ------------------------------------------------------------------------ |
672 | ||
2eff1425 EW |
673 | REBASE VS. PULL/MERGE |
674 | --------------------- | |
2e93115e | 675 | |
ba020ef5 | 676 | Originally, 'git-svn' recommended that the 'remotes/git-svn' branch be |
2eff1425 | 677 | pulled or merged from. This is because the author favored |
483bc4f0 JN |
678 | `git svn set-tree B` to commit a single head rather than the |
679 | `git svn set-tree A..B` notation to commit multiple commits. | |
2eff1425 | 680 | |
483bc4f0 | 681 | If you use `git svn set-tree A..B` to commit several diffs and you do |
2eff1425 | 682 | not have the latest remotes/git-svn merged into my-branch, you should |
483bc4f0 | 683 | use `git svn rebase` to update your work branch instead of `git pull` or |
ccf497de | 684 | `git merge`. `pull`/`merge` can cause non-linear history to be flattened |
2eff1425 EW |
685 | when committing into SVN, which can lead to merge commits reversing |
686 | previous commits in SVN. | |
2e93115e | 687 | |
3397f9df EW |
688 | DESIGN PHILOSOPHY |
689 | ----------------- | |
690 | Merge tracking in Subversion is lacking and doing branched development | |
ba020ef5 | 691 | with Subversion can be cumbersome as a result. While 'git-svn' can track |
bd43098c EW |
692 | copy history (including branches and tags) for repositories adopting a |
693 | standard layout, it cannot yet represent merge history that happened | |
694 | inside git back upstream to SVN users. Therefore it is advised that | |
695 | users keep history as linear as possible inside git to ease | |
696 | compatibility with SVN (see the CAVEATS section below). | |
1d52aba8 | 697 | |
aabb2e51 EW |
698 | CAVEATS |
699 | ------- | |
700 | ||
701 | For the sake of simplicity and interoperating with a less-capable system | |
ba020ef5 | 702 | (SVN), it is recommended that all 'git-svn' users clone, fetch and dcommit |
5833d730 | 703 | directly from the SVN server, and avoid all 'git-clone'/'pull'/'merge'/'push' |
aabb2e51 EW |
704 | operations between git repositories and branches. The recommended |
705 | method of exchanging code between git branches and users is | |
ba020ef5 | 706 | 'git-format-patch' and 'git-am', or just 'dcommit'ing to the SVN repository. |
aabb2e51 | 707 | |
ba020ef5 | 708 | Running 'git-merge' or 'git-pull' is NOT recommended on a branch you |
483bc4f0 | 709 | plan to 'dcommit' from. Subversion does not represent merges in any |
aabb2e51 EW |
710 | reasonable or useful fashion; so users using Subversion cannot see any |
711 | merges you've made. Furthermore, if you merge or pull from a git branch | |
483bc4f0 | 712 | that is a mirror of an SVN branch, 'dcommit' may commit to the wrong |
aabb2e51 EW |
713 | branch. |
714 | ||
ba020ef5 JN |
715 | 'git-clone' does not clone branches under the refs/remotes/ hierarchy or |
716 | any 'git-svn' metadata, or config. So repositories created and managed with | |
2fd02c92 | 717 | using 'git-svn' should use 'rsync' for cloning, if cloning is to be done |
aabb2e51 EW |
718 | at all. |
719 | ||
ba020ef5 | 720 | Since 'dcommit' uses rebase internally, any git branches you 'git-push' to |
483bc4f0 | 721 | before 'dcommit' on will require forcing an overwrite of the existing ref |
aabb2e51 | 722 | on the remote repository. This is generally considered bad practice, |
483bc4f0 | 723 | see the linkgit:git-push[1] documentation for details. |
aabb2e51 | 724 | |
483bc4f0 | 725 | Do not use the --amend option of linkgit:git-commit[1] on a change you've |
aabb2e51 EW |
726 | already dcommitted. It is considered bad practice to --amend commits |
727 | you've already pushed to a remote repository for other users, and | |
728 | dcommit with SVN is analogous to that. | |
729 | ||
3397f9df EW |
730 | BUGS |
731 | ---- | |
e8f5d908 | 732 | |
a81ed0b6 EW |
733 | We ignore all SVN properties except svn:executable. Any unhandled |
734 | properties are logged to $GIT_DIR/svn/<refname>/unhandled.log | |
3397f9df | 735 | |
bbe0c9b8 EW |
736 | Renamed and copied directories are not detected by git and hence not |
737 | tracked when committing to SVN. I do not plan on adding support for | |
738 | this as it's quite difficult and time-consuming to get working for all | |
a81ed0b6 EW |
739 | the possible corner cases (git doesn't do it, either). Committing |
740 | renamed and copied files are fully supported if they're similar enough | |
741 | for git to detect them. | |
bbe0c9b8 | 742 | |
a836a0e1 EW |
743 | CONFIGURATION |
744 | ------------- | |
745 | ||
ba020ef5 | 746 | 'git-svn' stores [svn-remote] configuration information in the |
a836a0e1 EW |
747 | repository .git/config file. It is similar the core git |
748 | [remote] sections except 'fetch' keys do not accept glob | |
749 | arguments; but they are instead handled by the 'branches' | |
750 | and 'tags' keys. Since some SVN repositories are oddly | |
751 | configured with multiple projects glob expansions such those | |
752 | listed below are allowed: | |
753 | ||
754 | ------------------------------------------------------------------------ | |
755 | [svn-remote "project-a"] | |
756 | url = http://server.org/svn | |
0e5e69a3 | 757 | fetch = trunk/project-a:refs/remotes/project-a/trunk |
a836a0e1 EW |
758 | branches = branches/*/project-a:refs/remotes/project-a/branches/* |
759 | tags = tags/*/project-a:refs/remotes/project-a/tags/* | |
a836a0e1 EW |
760 | ------------------------------------------------------------------------ |
761 | ||
4ddef0e6 | 762 | Keep in mind that the '\*' (asterisk) wildcard of the local ref |
d37a8de0 | 763 | (right of the ':') *must* be the farthest right path component; |
bad542f0 | 764 | however the remote wildcard may be anywhere as long as it's an |
02783075 | 765 | independent path component (surrounded by '/' or EOL). This |
a836a0e1 | 766 | type of configuration is not automatically created by 'init' and |
ba020ef5 | 767 | should be manually entered with a text-editor or using 'git-config'. |
a836a0e1 | 768 | |
2e93115e EW |
769 | SEE ALSO |
770 | -------- | |
5162e697 | 771 | linkgit:git-rebase[1] |
2e93115e | 772 | |
3397f9df EW |
773 | Author |
774 | ------ | |
775 | Written by Eric Wong <normalperson@yhbt.net>. | |
776 | ||
777 | Documentation | |
778 | ------------- | |
779 | Written by Eric Wong <normalperson@yhbt.net>. |