Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 1 | git-svn(1) |
| 2 | ========== |
| 3 | |
| 4 | NAME |
| 5 | ---- |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 6 | git-svn - Bidirectional operation between a Subversion repository and Git |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 7 | |
| 8 | SYNOPSIS |
| 9 | -------- |
Martin von Zweigbergk | 7791a1d | 2011-07-01 22:38:26 -0400 | [diff] [blame] | 10 | [verse] |
Robert P. J. Day | de61305 | 2018-05-24 16:11:39 -0400 | [diff] [blame] | 11 | 'git svn' <command> [<options>] [<arguments>] |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 12 | |
| 13 | DESCRIPTION |
| 14 | ----------- |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 15 | 'git svn' is a simple conduit for changesets between Subversion and Git. |
| 16 | It provides a bidirectional flow of changes between a Subversion and a Git |
Mike Ralphson | 1168d40 | 2008-08-05 17:12:05 +0100 | [diff] [blame] | 17 | repository. |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 18 | |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 19 | 'git svn' can track a standard Subversion repository, |
Marc Branchaud | ab81a36 | 2009-06-26 16:49:19 -0400 | [diff] [blame] | 20 | following the common "trunk/branches/tags" layout, with the --stdlayout option. |
| 21 | It can also follow branches and tags in any layout with the -T/-t/-b options |
| 22 | (see options to 'init' below, and also the 'clone' command). |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 23 | |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 24 | Once tracking a Subversion repository (with any of the above methods), the Git |
Brian Gernhardt | 8cb070a | 2008-07-29 21:16:01 -0400 | [diff] [blame] | 25 | repository can be updated from Subversion by the 'fetch' command and |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 26 | Subversion updated from Git by the 'dcommit' command. |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 27 | |
| 28 | COMMANDS |
| 29 | -------- |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 30 | |
| 31 | 'init':: |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 32 | Initializes an empty Git repository with additional |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 33 | metadata directories for 'git svn'. The Subversion URL |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 34 | may be specified as a command-line argument, or as full |
| 35 | URL arguments to -T/-t/-b. Optionally, the target |
| 36 | directory to operate on can be specified as a second |
| 37 | argument. Normally this command initializes the current |
| 38 | directory. |
| 39 | |
Karl Hasselström | cc1793e | 2007-05-04 09:03:22 +0200 | [diff] [blame] | 40 | -T<trunk_subdir>;; |
| 41 | --trunk=<trunk_subdir>;; |
| 42 | -t<tags_subdir>;; |
| 43 | --tags=<tags_subdir>;; |
| 44 | -b<branches_subdir>;; |
| 45 | --branches=<branches_subdir>;; |
martin f. krafft | 8f728fb | 2007-07-14 11:25:28 +0200 | [diff] [blame] | 46 | -s;; |
| 47 | --stdlayout;; |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 48 | These are optional command-line options for init. Each of |
| 49 | these flags can point to a relative repository path |
Marc Branchaud | ab81a36 | 2009-06-26 16:49:19 -0400 | [diff] [blame] | 50 | (--tags=project/tags) or a full url |
| 51 | (--tags=https://foo.org/project/tags). |
| 52 | You can specify more than one --tags and/or --branches options, in case |
| 53 | your Subversion repository places tags or branches under multiple paths. |
| 54 | The option --stdlayout is |
martin f. krafft | 8f728fb | 2007-07-14 11:25:28 +0200 | [diff] [blame] | 55 | a shorthand way of setting trunk,tags,branches as the relative paths, |
| 56 | which is the Subversion default. If any of the other options are given |
| 57 | as well, they take precedence. |
Karl Hasselström | cc1793e | 2007-05-04 09:03:22 +0200 | [diff] [blame] | 58 | --no-metadata;; |
Eric Wong | 0dfaf0a | 2007-02-18 02:34:09 -0800 | [diff] [blame] | 59 | Set the 'noMetadata' option in the [svn-remote] config. |
Eric Wong | c9be27f | 2010-08-21 18:52:14 +0000 | [diff] [blame] | 60 | This option is not recommended, please read the 'svn.noMetadata' |
| 61 | section of this manpage before using this option. |
Karl Hasselström | cc1793e | 2007-05-04 09:03:22 +0200 | [diff] [blame] | 62 | --use-svm-props;; |
Eric Wong | 0dfaf0a | 2007-02-18 02:34:09 -0800 | [diff] [blame] | 63 | Set the 'useSvmProps' option in the [svn-remote] config. |
Karl Hasselström | cc1793e | 2007-05-04 09:03:22 +0200 | [diff] [blame] | 64 | --use-svnsync-props;; |
Eric Wong | 0dfaf0a | 2007-02-18 02:34:09 -0800 | [diff] [blame] | 65 | Set the 'useSvnsyncProps' option in the [svn-remote] config. |
Karl Hasselström | cc1793e | 2007-05-04 09:03:22 +0200 | [diff] [blame] | 66 | --rewrite-root=<URL>;; |
Eric Wong | 0dfaf0a | 2007-02-18 02:34:09 -0800 | [diff] [blame] | 67 | Set the 'rewriteRoot' option in the [svn-remote] config. |
Jay Soffian | 3e18ce1 | 2010-01-23 03:30:00 -0500 | [diff] [blame] | 68 | --rewrite-uuid=<UUID>;; |
| 69 | Set the 'rewriteUUID' option in the [svn-remote] config. |
Michael J Gruber | 3b0d240 | 2011-02-17 08:48:06 +0100 | [diff] [blame] | 70 | --username=<user>;; |
Sam Vilain | a0d7fe3 | 2007-02-23 12:32:30 +1300 | [diff] [blame] | 71 | For transports that SVN handles authentication for (http, |
| 72 | https, and plain svn), specify the username. For other |
Jeff King | d595bdc | 2015-05-13 01:06:21 -0400 | [diff] [blame] | 73 | transports (e.g. `svn+ssh://`), you must include the username in |
| 74 | the URL, e.g. `svn+ssh://foo@svn.bar.com/project` |
Karl Hasselström | cc1793e | 2007-05-04 09:03:22 +0200 | [diff] [blame] | 75 | --prefix=<prefix>;; |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 76 | This allows one to specify a prefix which is prepended |
| 77 | to the names of remotes if trunk/branches/tags are |
| 78 | specified. The prefix does not automatically include a |
| 79 | trailing slash, so be sure you include one in the |
Gerrit Pape | 0d351e9 | 2007-06-19 16:47:41 +0000 | [diff] [blame] | 80 | argument if that is what you want. If --branches/-b is |
| 81 | specified, the prefix must include a trailing slash. |
Johan Herland | 7091a2d | 2013-10-11 14:57:05 +0200 | [diff] [blame] | 82 | Setting a prefix (with a trailing slash) is strongly |
| 83 | encouraged in any case, as your SVN-tracking refs will |
| 84 | then be located at "refs/remotes/$prefix/*", which is |
| 85 | compatible with Git's own remote-tracking ref layout |
| 86 | (refs/remotes/$remote/*). Setting a prefix is also useful |
| 87 | if you wish to track multiple projects that share a common |
| 88 | repository. |
Johan Herland | fe191fc | 2013-10-11 14:57:07 +0200 | [diff] [blame] | 89 | By default, the prefix is set to 'origin/'. |
Johan Herland | f849bb6 | 2013-10-11 14:57:06 +0200 | [diff] [blame] | 90 | + |
Johan Herland | fe191fc | 2013-10-11 14:57:07 +0200 | [diff] [blame] | 91 | NOTE: Before Git v2.0, the default prefix was "" (no prefix). This |
| 92 | meant that SVN-tracking refs were put at "refs/remotes/*", which is |
| 93 | incompatible with how Git's own remote-tracking refs are organized. |
Kyle J. McKay | 7bbc458 | 2014-04-22 04:16:22 -0700 | [diff] [blame] | 94 | If you still want the old default, you can get it by passing |
| 95 | `--prefix ""` on the command line (`--prefix=""` may not work if |
| 96 | your Perl's Getopt::Long is < v2.37). |
Johan Herland | f849bb6 | 2013-10-11 14:57:06 +0200 | [diff] [blame] | 97 | |
Andreas Heiduk | 16fbca0 | 2017-06-07 20:32:14 +0200 | [diff] [blame] | 98 | --ignore-refs=<regex>;; |
| 99 | When passed to 'init' or 'clone' this regular expression will |
| 100 | be preserved as a config key. See 'fetch' for a description |
| 101 | of `--ignore-refs`. |
Ben Jackson | 88ec205 | 2009-04-11 10:46:18 -0700 | [diff] [blame] | 102 | --ignore-paths=<regex>;; |
| 103 | When passed to 'init' or 'clone' this regular expression will |
| 104 | be preserved as a config key. See 'fetch' for a description |
Matthieu Moy | bcf9626 | 2016-06-28 13:40:11 +0200 | [diff] [blame] | 105 | of `--ignore-paths`. |
Paul Walmsley | a7b1023 | 2013-05-04 00:10:18 +0100 | [diff] [blame] | 106 | --include-paths=<regex>;; |
| 107 | When passed to 'init' or 'clone' this regular expression will |
| 108 | be preserved as a config key. See 'fetch' for a description |
Matthieu Moy | bcf9626 | 2016-06-28 13:40:11 +0200 | [diff] [blame] | 109 | of `--include-paths`. |
Eric Wong | 6b48829 | 2009-07-25 00:00:50 -0700 | [diff] [blame] | 110 | --no-minimize-url;; |
| 111 | When tracking multiple directories (using --stdlayout, |
| 112 | --branches, or --tags options), git svn will attempt to connect |
| 113 | to the root (or highest allowed level) of the Subversion |
| 114 | repository. This default allows better tracking of history if |
| 115 | entire projects are moved within a repository, but may cause |
| 116 | issues on repositories where read access restrictions are in |
Matthieu Moy | bcf9626 | 2016-06-28 13:40:11 +0200 | [diff] [blame] | 117 | place. Passing `--no-minimize-url` will allow git svn to |
Eric Wong | 6b48829 | 2009-07-25 00:00:50 -0700 | [diff] [blame] | 118 | accept URLs as-is without attempting to connect to a higher |
| 119 | level directory. This option is off by default when only |
| 120 | one URL/branch is tracked (it would do little good). |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 121 | |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 122 | 'fetch':: |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 123 | Fetch unfetched revisions from the Subversion remote we are |
| 124 | tracking. The name of the [svn-remote "..."] section in the |
Keshav Kini | 6fe7a30 | 2013-09-29 18:45:59 -0500 | [diff] [blame] | 125 | $GIT_DIR/config file may be specified as an optional |
| 126 | command-line argument. |
Keshav Kini | 945b9c1 | 2013-09-29 18:46:00 -0500 | [diff] [blame] | 127 | + |
| 128 | This automatically updates the rev_map if needed (see |
Martin Ågren | 4c8b882 | 2019-03-06 07:30:17 +0100 | [diff] [blame] | 129 | '$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details). |
Eric Wong | b705ba4 | 2006-02-27 11:04:02 -0800 | [diff] [blame] | 130 | |
Pete Harlan | e82f0d7 | 2009-01-17 20:10:14 -0800 | [diff] [blame] | 131 | --localtime;; |
Jason St. John | 0ffa154 | 2013-11-08 19:48:52 -0500 | [diff] [blame] | 132 | Store Git commit times in the local time zone instead of UTC. This |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 133 | makes 'git log' (even without --date=local) show the same times |
Jason St. John | 0ffa154 | 2013-11-08 19:48:52 -0500 | [diff] [blame] | 134 | that `svn log` would in the local time zone. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 135 | + |
Pete Harlan | e82f0d7 | 2009-01-17 20:10:14 -0800 | [diff] [blame] | 136 | This doesn't interfere with interoperating with the Subversion |
| 137 | repository you cloned from, but if you wish for your local Git |
| 138 | repository to be able to interoperate with someone else's local Git |
| 139 | repository, either don't use this option or you should both use it in |
Jason St. John | 0ffa154 | 2013-11-08 19:48:52 -0500 | [diff] [blame] | 140 | the same local time zone. |
Pete Harlan | e82f0d7 | 2009-01-17 20:10:14 -0800 | [diff] [blame] | 141 | |
Tuomas Suutari | 61f36a7 | 2009-08-14 11:11:58 +0300 | [diff] [blame] | 142 | --parent;; |
| 143 | Fetch only from the SVN parent of the current HEAD. |
| 144 | |
Andreas Heiduk | 16fbca0 | 2017-06-07 20:32:14 +0200 | [diff] [blame] | 145 | --ignore-refs=<regex>;; |
| 146 | Ignore refs for branches or tags matching the Perl regular |
| 147 | expression. A "negative look-ahead assertion" like |
| 148 | `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` |
| 149 | can be used to allow only certain refs. |
| 150 | + |
| 151 | [verse] |
| 152 | config key: svn-remote.<name>.ignore-refs |
| 153 | + |
| 154 | If the ignore-refs configuration key is set, and the command-line |
| 155 | option is also given, both regular expressions will be used. |
| 156 | |
Vitaly \"_Vi\" Shukela | 6076b84 | 2009-01-26 00:21:41 +0200 | [diff] [blame] | 157 | --ignore-paths=<regex>;; |
Ben Jackson | 0d8bee7 | 2009-04-11 10:46:17 -0700 | [diff] [blame] | 158 | This allows one to specify a Perl regular expression that will |
Vitaly \"_Vi\" Shukela | 6076b84 | 2009-01-26 00:21:41 +0200 | [diff] [blame] | 159 | cause skipping of all matching paths from checkout from SVN. |
Matthieu Moy | bcf9626 | 2016-06-28 13:40:11 +0200 | [diff] [blame] | 160 | The `--ignore-paths` option should match for every 'fetch' |
Ben Jackson | 0d8bee7 | 2009-04-11 10:46:17 -0700 | [diff] [blame] | 161 | (including automatic fetches due to 'clone', 'dcommit', |
| 162 | 'rebase', etc) on a given repository. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 163 | + |
| 164 | [verse] |
Ben Jackson | 0d8bee7 | 2009-04-11 10:46:17 -0700 | [diff] [blame] | 165 | config key: svn-remote.<name>.ignore-paths |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 166 | + |
Jason St. John | 06ab60c | 2014-05-21 14:52:26 -0400 | [diff] [blame] | 167 | If the ignore-paths configuration key is set, and the command-line |
| 168 | option is also given, both regular expressions will be used. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 169 | + |
Ben Jackson | 0d8bee7 | 2009-04-11 10:46:17 -0700 | [diff] [blame] | 170 | Examples: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 171 | + |
| 172 | -- |
| 173 | Skip "doc*" directory for every fetch;; |
| 174 | + |
| 175 | ------------------------------------------------------------------------ |
| 176 | --ignore-paths="^doc" |
| 177 | ------------------------------------------------------------------------ |
Ben Jackson | 0d8bee7 | 2009-04-11 10:46:17 -0700 | [diff] [blame] | 178 | |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 179 | Skip "branches" and "tags" of first level directories;; |
| 180 | + |
| 181 | ------------------------------------------------------------------------ |
| 182 | --ignore-paths="^[^/]+/(?:branches|tags)" |
| 183 | ------------------------------------------------------------------------ |
| 184 | -- |
Vitaly \"_Vi\" Shukela | 6076b84 | 2009-01-26 00:21:41 +0200 | [diff] [blame] | 185 | |
Paul Walmsley | a7b1023 | 2013-05-04 00:10:18 +0100 | [diff] [blame] | 186 | --include-paths=<regex>;; |
| 187 | This allows one to specify a Perl regular expression that will |
| 188 | cause the inclusion of only matching paths from checkout from SVN. |
Matthieu Moy | bcf9626 | 2016-06-28 13:40:11 +0200 | [diff] [blame] | 189 | The `--include-paths` option should match for every 'fetch' |
Paul Walmsley | a7b1023 | 2013-05-04 00:10:18 +0100 | [diff] [blame] | 190 | (including automatic fetches due to 'clone', 'dcommit', |
Matthieu Moy | bcf9626 | 2016-06-28 13:40:11 +0200 | [diff] [blame] | 191 | 'rebase', etc) on a given repository. `--ignore-paths` takes |
| 192 | precedence over `--include-paths`. |
Brett Randall | 486e1e1 | 2015-08-24 10:23:45 +1000 | [diff] [blame] | 193 | + |
| 194 | [verse] |
| 195 | config key: svn-remote.<name>.include-paths |
Paul Walmsley | a7b1023 | 2013-05-04 00:10:18 +0100 | [diff] [blame] | 196 | |
Gunnlaugur Þór Briem | bc22b27 | 2012-10-23 10:33:26 +0000 | [diff] [blame] | 197 | --log-window-size=<n>;; |
Stefan Beller | 3c123fb | 2013-10-21 21:36:06 +0200 | [diff] [blame] | 198 | Fetch <n> log entries per request when scanning Subversion history. |
| 199 | The default is 100. For very large Subversion repositories, larger |
| 200 | values may be needed for 'clone'/'fetch' to complete in reasonable |
| 201 | time. But overly large values may lead to higher memory usage and |
| 202 | request timeouts. |
Gunnlaugur Þór Briem | bc22b27 | 2012-10-23 10:33:26 +0000 | [diff] [blame] | 203 | |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 204 | 'clone':: |
| 205 | Runs 'init' and 'fetch'. It will automatically create a |
| 206 | directory based on the basename of the URL passed to it; |
| 207 | or if a second argument is passed; it will create a directory |
| 208 | and work within that. It accepts all arguments that the |
| 209 | 'init' and 'fetch' commands accept; with the exception of |
Matthieu Moy | bcf9626 | 2016-06-28 13:40:11 +0200 | [diff] [blame] | 210 | `--fetch-all` and `--parent`. After a repository is cloned, |
Yann Dirson | 0da3e1d | 2009-07-07 22:22:22 +0200 | [diff] [blame] | 211 | the 'fetch' command will be able to update revisions without |
| 212 | affecting the working tree; and the 'rebase' command will be |
| 213 | able to update the working tree with the latest changes. |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 214 | |
Ray Chen | 40a1530 | 2011-07-20 18:37:26 -0400 | [diff] [blame] | 215 | --preserve-empty-dirs;; |
| 216 | Create a placeholder file in the local Git repository for each |
| 217 | empty directory fetched from Subversion. This includes directories |
| 218 | that become empty by removing all entries in the Subversion |
| 219 | repository (but not the directory itself). The placeholder files |
| 220 | are also tracked and removed when no longer necessary. |
| 221 | |
| 222 | --placeholder-filename=<filename>;; |
| 223 | Set the name of placeholder files created by --preserve-empty-dirs. |
| 224 | Default: ".gitignore" |
| 225 | |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 226 | 'rebase':: |
| 227 | This fetches revisions from the SVN parent of the current HEAD |
| 228 | and rebases the current (uncommitted to SVN) work against it. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 229 | + |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 230 | This works similarly to `svn update` or 'git pull' except that |
| 231 | it preserves linear history with 'git rebase' instead of |
| 232 | 'git merge' for ease of dcommitting with 'git svn'. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 233 | + |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 234 | This accepts all options that 'git svn fetch' and 'git rebase' |
Matthieu Moy | bcf9626 | 2016-06-28 13:40:11 +0200 | [diff] [blame] | 235 | accept. However, `--fetch-all` only fetches from the current |
Sergey Vlasov | 112f638 | 2007-03-01 22:41:17 +0300 | [diff] [blame] | 236 | [svn-remote], and not all [svn-remote] definitions. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 237 | + |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 238 | Like 'git rebase'; this requires that the working tree be clean |
Sergey Vlasov | 112f638 | 2007-03-01 22:41:17 +0300 | [diff] [blame] | 239 | and have no uncommitted changes. |
Keshav Kini | 945b9c1 | 2013-09-29 18:46:00 -0500 | [diff] [blame] | 240 | + |
| 241 | This automatically updates the rev_map if needed (see |
Martin Ågren | 4c8b882 | 2019-03-06 07:30:17 +0100 | [diff] [blame] | 242 | '$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details). |
Karl Hasselström | cc1793e | 2007-05-04 09:03:22 +0200 | [diff] [blame] | 243 | |
Eric Wong | dee41f3 | 2007-03-13 11:40:36 -0700 | [diff] [blame] | 244 | -l;; |
| 245 | --local;; |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 246 | Do not fetch remotely; only run 'git rebase' against the |
Eric Wong | dee41f3 | 2007-03-13 11:40:36 -0700 | [diff] [blame] | 247 | last fetched commit from the upstream SVN. |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 248 | |
Eric Wong | b22d449 | 2006-08-26 00:01:23 -0700 | [diff] [blame] | 249 | 'dcommit':: |
Jon Seymour | 2b26b65f | 2012-05-17 13:20:43 +1000 | [diff] [blame] | 250 | Commit each diff from the current branch directly to the SVN |
Eric Wong | b22d449 | 2006-08-26 00:01:23 -0700 | [diff] [blame] | 251 | repository, and then rebase or reset (depending on whether or |
Eric Wong | 2eff142 | 2007-01-06 17:53:40 -0800 | [diff] [blame] | 252 | not there is a diff between SVN and head). This will create |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 253 | a revision in SVN for each commit in Git. |
Jon Seymour | 2b26b65f | 2012-05-17 13:20:43 +1000 | [diff] [blame] | 254 | + |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 255 | When an optional Git branch name (or a Git commit object name) |
Jon Seymour | 2b26b65f | 2012-05-17 13:20:43 +1000 | [diff] [blame] | 256 | is specified as an argument, the subcommand works on the specified |
| 257 | branch, not on the current branch. |
| 258 | + |
| 259 | Use of 'dcommit' is preferred to 'set-tree' (below). |
Karl Hasselström | 171af11 | 2007-05-03 07:51:35 +0200 | [diff] [blame] | 260 | + |
| 261 | --no-rebase;; |
| 262 | After committing, do not rebase or reset. |
Eric Wong | ba24e74 | 2008-08-07 02:06:16 -0700 | [diff] [blame] | 263 | --commit-url <URL>;; |
| 264 | Commit to this SVN URL (the full path). This is intended to |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 265 | allow existing 'git svn' repositories created with one transport |
Eric Wong | ba24e74 | 2008-08-07 02:06:16 -0700 | [diff] [blame] | 266 | method (e.g. `svn://` or `http://` for anonymous read) to be |
| 267 | reused if a user is later given access to an alternate transport |
| 268 | method (e.g. `svn+ssh://` or `https://`) for commit. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 269 | + |
| 270 | [verse] |
Peter Oberndorfer | 0df8405 | 2009-02-23 12:02:53 +0100 | [diff] [blame] | 271 | config key: svn-remote.<name>.commiturl |
Peter Oberndorfer | 0df8405 | 2009-02-23 12:02:53 +0100 | [diff] [blame] | 272 | config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options) |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 273 | + |
Sveinung Kvilhaugsvik | f947ae4 | 2014-10-10 00:49:59 +0200 | [diff] [blame] | 274 | Note that the SVN URL of the commiturl config key includes the SVN branch. |
| 275 | If you rather want to set the commit URL for an entire SVN repository use |
| 276 | svn-remote.<name>.pushurl instead. |
| 277 | + |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 278 | Using this option for any other purpose (don't ask) is very strongly |
| 279 | discouraged. |
Eric Wong | b22d449 | 2006-08-26 00:01:23 -0700 | [diff] [blame] | 280 | |
Michael J Gruber | ccc2fcf | 2011-04-19 14:24:27 +0200 | [diff] [blame] | 281 | --mergeinfo=<mergeinfo>;; |
| 282 | Add the given merge information during the dcommit |
| 283 | (e.g. `--mergeinfo="/branches/foo:1-10"`). All svn server versions can |
| 284 | store this information (as a property), and svn clients starting from |
Bryan Jacobs | 98c4ab3 | 2011-08-31 12:48:39 -0400 | [diff] [blame] | 285 | version 1.5 can make use of it. To specify merge information from multiple |
| 286 | branches, use a single space character between the branches |
| 287 | (`--mergeinfo="/branches/foo:1-10 /branches/bar:3,5-6,8"`) |
Bryan Jacobs | 1e5814f | 2011-09-07 13:36:05 -0400 | [diff] [blame] | 288 | + |
| 289 | [verse] |
| 290 | config key: svn.pushmergeinfo |
| 291 | + |
| 292 | This option will cause git-svn to attempt to automatically populate the |
| 293 | svn:mergeinfo property in the SVN repository when possible. Currently, this can |
| 294 | only be done when dcommitting non-fast-forward merges where all parents but the |
| 295 | first have already been pushed into SVN. |
Michael J Gruber | ccc2fcf | 2011-04-19 14:24:27 +0200 | [diff] [blame] | 296 | |
Frédéric Heitzmann | afd7f1e | 2011-09-16 23:02:01 +0200 | [diff] [blame] | 297 | --interactive;; |
| 298 | Ask the user to confirm that a patch set should actually be sent to SVN. |
| 299 | For each patch, one may answer "yes" (accept this patch), "no" (discard this |
| 300 | patch), "all" (accept all patches), or "quit". |
Jeff King | 5a8a19e | 2015-05-13 00:58:16 -0400 | [diff] [blame] | 301 | + |
| 302 | 'git svn dcommit' returns immediately if answer is "no" or "quit", without |
| 303 | committing anything to SVN. |
Frédéric Heitzmann | afd7f1e | 2011-09-16 23:02:01 +0200 | [diff] [blame] | 304 | |
Florian Ragwitz | 5de70ef | 2008-10-04 19:35:17 -0700 | [diff] [blame] | 305 | 'branch':: |
| 306 | Create a branch in the SVN repository. |
| 307 | |
| 308 | -m;; |
| 309 | --message;; |
| 310 | Allows to specify the commit message. |
| 311 | |
| 312 | -t;; |
| 313 | --tag;; |
| 314 | Create a tag by using the tags_subdir instead of the branches_subdir |
| 315 | specified during git svn init. |
| 316 | |
Jonathan Nieder | 7d82b4a | 2011-12-19 19:24:30 -0600 | [diff] [blame] | 317 | -d<path>;; |
| 318 | --destination=<path>;; |
| 319 | |
Marc Branchaud | ab81a36 | 2009-06-26 16:49:19 -0400 | [diff] [blame] | 320 | If more than one --branches (or --tags) option was given to the 'init' |
| 321 | or 'clone' command, you must provide the location of the branch (or |
Jonathan Nieder | 7d82b4a | 2011-12-19 19:24:30 -0600 | [diff] [blame] | 322 | tag) you wish to create in the SVN repository. <path> specifies which |
| 323 | path to use to create the branch or tag and should match the pattern |
| 324 | on the left-hand side of one of the configured branches or tags |
| 325 | refspecs. You can see these refspecs with the commands |
Marc Branchaud | ab81a36 | 2009-06-26 16:49:19 -0400 | [diff] [blame] | 326 | + |
| 327 | git config --get-all svn-remote.<name>.branches |
| 328 | git config --get-all svn-remote.<name>.tags |
| 329 | + |
| 330 | where <name> is the name of the SVN repository as specified by the -R option to |
| 331 | 'init' (or "svn" by default). |
| 332 | |
Igor Mironov | a65f3c2 | 2010-01-12 03:22:27 +1100 | [diff] [blame] | 333 | --username;; |
| 334 | Specify the SVN username to perform the commit as. This option overrides |
Ævar Arnfjörð Bjarmason | cb82dbf | 2010-05-07 19:50:03 +0000 | [diff] [blame] | 335 | the 'username' configuration property. |
Igor Mironov | a65f3c2 | 2010-01-12 03:22:27 +1100 | [diff] [blame] | 336 | |
| 337 | --commit-url;; |
| 338 | Use the specified URL to connect to the destination Subversion |
| 339 | repository. This is useful in cases where the source SVN |
| 340 | repository is read-only. This option overrides configuration |
| 341 | property 'commiturl'. |
| 342 | + |
| 343 | git config --get-all svn-remote.<name>.commiturl |
| 344 | + |
| 345 | |
Tobias Schulte | f4f4c7f | 2013-05-15 22:14:43 +0200 | [diff] [blame] | 346 | --parents;; |
| 347 | Create parent folders. This parameter is equivalent to the parameter |
| 348 | --parents on svn cp commands and is useful for non-standard repository |
| 349 | layouts. |
| 350 | |
Florian Ragwitz | 5de70ef | 2008-10-04 19:35:17 -0700 | [diff] [blame] | 351 | 'tag':: |
| 352 | Create a tag in the SVN repository. This is a shorthand for |
| 353 | 'branch -t'. |
| 354 | |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 355 | 'log':: |
| 356 | This should make it easy to look up svn log messages when svn |
| 357 | users refer to -r/--revision numbers. |
Sergey Vlasov | 112f638 | 2007-03-01 22:41:17 +0300 | [diff] [blame] | 358 | + |
| 359 | The following features from `svn log' are supported: |
| 360 | + |
| 361 | -- |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 362 | -r <n>[:<n>];; |
| 363 | --revision=<n>[:<n>];; |
Sergey Vlasov | 112f638 | 2007-03-01 22:41:17 +0300 | [diff] [blame] | 364 | is supported, non-numeric args are not: |
| 365 | HEAD, NEXT, BASE, PREV, etc ... |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 366 | -v;; |
| 367 | --verbose;; |
Sergey Vlasov | 112f638 | 2007-03-01 22:41:17 +0300 | [diff] [blame] | 368 | it's not completely compatible with the --verbose |
| 369 | output in svn log, but reasonably close. |
| 370 | --limit=<n>;; |
| 371 | is NOT the same as --max-count, doesn't count |
| 372 | merged/excluded commits |
| 373 | --incremental;; |
| 374 | supported |
| 375 | -- |
| 376 | + |
| 377 | New features: |
| 378 | + |
| 379 | -- |
| 380 | --show-commit;; |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 381 | shows the Git commit sha1, as well |
Sergey Vlasov | 112f638 | 2007-03-01 22:41:17 +0300 | [diff] [blame] | 382 | --oneline;; |
| 383 | our version of --pretty=oneline |
| 384 | -- |
| 385 | + |
Miklos Vajna | a50a5c8 | 2008-02-27 14:13:00 +0100 | [diff] [blame] | 386 | NOTE: SVN itself only stores times in UTC and nothing else. The regular svn |
| 387 | client converts the UTC time to the local time (or based on the TZ= |
| 388 | environment). This command has the same behaviour. |
| 389 | + |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 390 | Any other arguments are passed directly to 'git log' |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 391 | |
Tim Stoakes | 6fb5375 | 2008-02-10 15:21:08 +1030 | [diff] [blame] | 392 | 'blame':: |
Stefan Beller | 3c123fb | 2013-10-21 21:36:06 +0200 | [diff] [blame] | 393 | Show what revision and author last modified each line of a file. The |
| 394 | output of this mode is format-compatible with the output of |
| 395 | `svn blame' by default. Like the SVN blame command, |
| 396 | local uncommitted changes in the working tree are ignored; |
| 397 | the version of the file in the HEAD revision is annotated. Unknown |
| 398 | arguments are passed directly to 'git blame'. |
Tim Stoakes | 6fb5375 | 2008-02-10 15:21:08 +1030 | [diff] [blame] | 399 | + |
Steven Grimm | 4be4038 | 2008-05-10 22:11:18 -0700 | [diff] [blame] | 400 | --git-format;; |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 401 | Produce output in the same format as 'git blame', but with |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 402 | SVN revision numbers instead of Git commit hashes. In this mode, |
Steven Grimm | 4be4038 | 2008-05-10 22:11:18 -0700 | [diff] [blame] | 403 | changes that haven't been committed to SVN (including local |
| 404 | working-copy edits) are shown as revision 0. |
Tim Stoakes | 6fb5375 | 2008-02-10 15:21:08 +1030 | [diff] [blame] | 405 | |
Adam Roben | 26e6016 | 2007-04-27 11:57:53 -0700 | [diff] [blame] | 406 | 'find-rev':: |
| 407 | When given an SVN revision number of the form 'rN', returns the |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 408 | corresponding Git commit hash (this can optionally be followed by a |
Adam Roben | b3cb7e4 | 2007-04-29 01:35:27 -0700 | [diff] [blame] | 409 | tree-ish to specify which branch should be searched). When given a |
| 410 | tree-ish, returns the corresponding SVN revision number. |
John Keeping | 2934a48 | 2013-01-17 22:19:33 +0000 | [diff] [blame] | 411 | + |
Eric Wong | a831a3f | 2014-09-07 08:35:19 +0000 | [diff] [blame] | 412 | -B;; |
John Keeping | 2934a48 | 2013-01-17 22:19:33 +0000 | [diff] [blame] | 413 | --before;; |
| 414 | Don't require an exact match if given an SVN revision, instead find |
| 415 | the commit corresponding to the state of the SVN repository (on the |
| 416 | current branch) at the specified revision. |
| 417 | + |
Eric Wong | a831a3f | 2014-09-07 08:35:19 +0000 | [diff] [blame] | 418 | -A;; |
John Keeping | 2934a48 | 2013-01-17 22:19:33 +0000 | [diff] [blame] | 419 | --after;; |
| 420 | Don't require an exact match if given an SVN revision; if there is |
| 421 | not an exact match return the closest match searching forward in the |
| 422 | history. |
Adam Roben | 26e6016 | 2007-04-27 11:57:53 -0700 | [diff] [blame] | 423 | |
Eric Wong | 3289e86 | 2006-12-15 23:58:08 -0800 | [diff] [blame] | 424 | 'set-tree':: |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 425 | You should consider using 'dcommit' instead of this command. |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 426 | Commit specified commit or tree objects to SVN. This relies on |
Martin Ågren | 7560f54 | 2017-08-23 19:49:35 +0200 | [diff] [blame] | 427 | your imported fetch data being up to date. This makes |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 428 | absolutely no attempts to do patching when committing to SVN, it |
| 429 | simply overwrites files with those specified in the tree or |
| 430 | commit. All merging is assumed to have taken place |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 431 | independently of 'git svn' functions. |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 432 | |
Gustaf Hendeby | da060c6 | 2008-05-05 00:33:10 +0200 | [diff] [blame] | 433 | 'create-ignore':: |
Gustaf Hendeby | da060c6 | 2008-05-05 00:33:10 +0200 | [diff] [blame] | 434 | Recursively finds the svn:ignore property on directories and |
| 435 | creates matching .gitignore files. The resulting files are staged to |
Gustaf Hendeby | 6923972 | 2008-05-20 00:47:28 +0200 | [diff] [blame] | 436 | be committed, but are not committed. Use -r/--revision to refer to a |
Mike Ralphson | 1168d40 | 2008-08-05 17:12:05 +0100 | [diff] [blame] | 437 | specific revision. |
Gustaf Hendeby | da060c6 | 2008-05-05 00:33:10 +0200 | [diff] [blame] | 438 | |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 439 | 'show-ignore':: |
Eric Wong | 8f22562 | 2006-02-26 02:22:27 -0800 | [diff] [blame] | 440 | Recursively finds and lists the svn:ignore property on |
| 441 | directories. The output is suitable for appending to |
| 442 | the $GIT_DIR/info/exclude file. |
| 443 | |
Eric Wong | 6111b93 | 2009-11-15 18:57:16 -0800 | [diff] [blame] | 444 | 'mkdirs':: |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 445 | Attempts to recreate empty directories that core Git cannot track |
Eric Wong | 6111b93 | 2009-11-15 18:57:16 -0800 | [diff] [blame] | 446 | based on information in $GIT_DIR/svn/<refname>/unhandled.log files. |
| 447 | Empty directories are automatically recreated when using |
| 448 | "git svn clone" and "git svn rebase", so "mkdirs" is intended |
| 449 | for use after commands like "git checkout" or "git reset". |
Michael Haggerty | 55f9d7a | 2011-04-01 12:26:00 +0200 | [diff] [blame] | 450 | (See the svn-remote.<name>.automkdirs config file option for |
| 451 | more information.) |
Eric Wong | 6111b93 | 2009-11-15 18:57:16 -0800 | [diff] [blame] | 452 | |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 453 | 'commit-diff':: |
| 454 | Commits the diff of two tree-ish arguments from the |
Ville Skyttä | 928f0ab | 2018-06-22 09:50:37 +0300 | [diff] [blame] | 455 | command-line. This command does not rely on being inside a `git svn |
Jonathan Nieder | 483bc4f | 2008-06-30 13:56:34 -0500 | [diff] [blame] | 456 | init`-ed repository. This command takes three arguments, (a) the |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 457 | original tree to diff against, (b) the new tree result, (c) the |
| 458 | URL of the target Subversion repository. The final argument |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 459 | (URL) may be omitted if you are working from a 'git svn'-aware |
| 460 | repository (that has been `init`-ed with 'git svn'). |
Eric Wong | 45bf473 | 2006-11-09 01:19:37 -0800 | [diff] [blame] | 461 | The -r<revision> option is required for this. |
Andreas Heiduk | da44610 | 2017-06-14 11:31:38 +0200 | [diff] [blame] | 462 | + |
| 463 | The commit message is supplied either directly with the `-m` or `-F` |
| 464 | option, or indirectly from the tag or commit when the second tree-ish |
| 465 | denotes such an object, or it is requested by invoking an editor (see |
| 466 | `--edit` option below). |
| 467 | |
| 468 | -m <msg>;; |
| 469 | --message=<msg>;; |
| 470 | Use the given `msg` as the commit message. This option |
| 471 | disables the `--edit` option. |
| 472 | |
| 473 | -F <filename>;; |
| 474 | --file=<filename>;; |
| 475 | Take the commit message from the given file. This option |
| 476 | disables the `--edit` option. |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 477 | |
David D. Kilzer | e6fefa9 | 2007-11-21 11:57:18 -0800 | [diff] [blame] | 478 | 'info':: |
| 479 | Shows information about a file or directory similar to what |
| 480 | `svn info' provides. Does not currently support a -r/--revision |
David D. Kilzer | 8b014d7 | 2007-11-21 11:57:19 -0800 | [diff] [blame] | 481 | argument. Use the --url option to output only the value of the |
| 482 | 'URL:' field. |
David D. Kilzer | e6fefa9 | 2007-11-21 11:57:18 -0800 | [diff] [blame] | 483 | |
Gustaf Hendeby | 6923972 | 2008-05-20 00:47:28 +0200 | [diff] [blame] | 484 | 'proplist':: |
| 485 | Lists the properties stored in the Subversion repository about a |
| 486 | given file or directory. Use -r/--revision to refer to a specific |
| 487 | Subversion revision. |
| 488 | |
| 489 | 'propget':: |
| 490 | Gets the Subversion property given as the first argument, for a |
| 491 | file. A specific revision can be specified with -r/--revision. |
| 492 | |
Alfred Perlstein | 19a7f24 | 2016-06-14 22:19:50 -0700 | [diff] [blame] | 493 | 'propset':: |
| 494 | Sets the Subversion property given as the first argument, to the |
| 495 | value given as the second argument for the file given as the |
| 496 | third argument. |
| 497 | + |
| 498 | Example: |
| 499 | + |
| 500 | ------------------------------------------------------------------------ |
| 501 | git svn propset svn:keywords "FreeBSD=%H" devel/py-tipper/Makefile |
| 502 | ------------------------------------------------------------------------ |
| 503 | + |
| 504 | This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file |
| 505 | 'devel/py-tipper/Makefile'. |
| 506 | |
Gustaf Hendeby | 6923972 | 2008-05-20 00:47:28 +0200 | [diff] [blame] | 507 | 'show-externals':: |
| 508 | Shows the Subversion externals. Use -r/--revision to specify a |
| 509 | specific revision. |
| 510 | |
Robert Allan Zeh | 2da9ee0 | 2009-07-19 18:00:52 -0500 | [diff] [blame] | 511 | 'gc':: |
Keshav Kini | e618c39 | 2013-09-29 18:45:58 -0500 | [diff] [blame] | 512 | Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove |
| 513 | $GIT_DIR/svn/<refname>/index files. |
Robert Allan Zeh | 2da9ee0 | 2009-07-19 18:00:52 -0500 | [diff] [blame] | 514 | |
Ben Jackson | 195643f | 2009-06-03 20:45:52 -0700 | [diff] [blame] | 515 | 'reset':: |
| 516 | Undoes the effects of 'fetch' back to the specified revision. |
| 517 | This allows you to re-'fetch' an SVN revision. Normally the |
| 518 | contents of an SVN revision should never change and 'reset' |
| 519 | should not be necessary. However, if SVN permissions change, |
| 520 | or if you alter your --ignore-paths option, a 'fetch' may fail |
| 521 | with "not found in commit" (file not previously visible) or |
| 522 | "checksum mismatch" (missed a modification). If the problem |
| 523 | file cannot be ignored forever (with --ignore-paths) the only |
| 524 | way to repair the repo is to use 'reset'. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 525 | + |
Keshav Kini | 945b9c1 | 2013-09-29 18:46:00 -0500 | [diff] [blame] | 526 | Only the rev_map and refs/remotes/git-svn are changed (see |
Martin Ågren | 4c8b882 | 2019-03-06 07:30:17 +0100 | [diff] [blame] | 527 | '$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details). |
Keshav Kini | 945b9c1 | 2013-09-29 18:46:00 -0500 | [diff] [blame] | 528 | Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to |
| 529 | move local branches onto the new tree. |
Ben Jackson | 195643f | 2009-06-03 20:45:52 -0700 | [diff] [blame] | 530 | |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 531 | -r <n>;; |
| 532 | --revision=<n>;; |
Ben Jackson | 195643f | 2009-06-03 20:45:52 -0700 | [diff] [blame] | 533 | Specify the most recent revision to keep. All later revisions |
| 534 | are discarded. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 535 | -p;; |
| 536 | --parent;; |
Ben Jackson | 195643f | 2009-06-03 20:45:52 -0700 | [diff] [blame] | 537 | Discard the specified revision as well, keeping the nearest |
| 538 | parent instead. |
| 539 | Example:;; |
| 540 | Assume you have local changes in "master", but you need to refetch "r2". |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 541 | + |
Ben Jackson | 195643f | 2009-06-03 20:45:52 -0700 | [diff] [blame] | 542 | ------------ |
| 543 | r1---r2---r3 remotes/git-svn |
| 544 | \ |
| 545 | A---B master |
| 546 | ------------ |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 547 | + |
Ben Jackson | 195643f | 2009-06-03 20:45:52 -0700 | [diff] [blame] | 548 | Fix the ignore-paths or SVN permissions problem that caused "r2" to |
| 549 | be incomplete in the first place. Then: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 550 | + |
Ben Jackson | 195643f | 2009-06-03 20:45:52 -0700 | [diff] [blame] | 551 | [verse] |
| 552 | git svn reset -r2 -p |
| 553 | git svn fetch |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 554 | + |
Ben Jackson | 195643f | 2009-06-03 20:45:52 -0700 | [diff] [blame] | 555 | ------------ |
| 556 | r1---r2'--r3' remotes/git-svn |
| 557 | \ |
| 558 | r2---r3---A---B master |
| 559 | ------------ |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 560 | + |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 561 | Then fixup "master" with 'git rebase'. |
| 562 | Do NOT use 'git merge' or your history will not be compatible with a |
Ben Jackson | 195643f | 2009-06-03 20:45:52 -0700 | [diff] [blame] | 563 | future 'dcommit'! |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 564 | + |
Ben Jackson | 195643f | 2009-06-03 20:45:52 -0700 | [diff] [blame] | 565 | [verse] |
| 566 | git rebase --onto remotes/git-svn A^ master |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 567 | + |
Ben Jackson | 195643f | 2009-06-03 20:45:52 -0700 | [diff] [blame] | 568 | ------------ |
| 569 | r1---r2'--r3' remotes/git-svn |
| 570 | \ |
| 571 | A'--B' master |
| 572 | ------------ |
| 573 | |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 574 | OPTIONS |
| 575 | ------- |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 576 | |
Štěpán Němec | 0adda93 | 2010-10-08 19:31:17 +0200 | [diff] [blame] | 577 | --shared[=(false|true|umask|group|all|world|everybody)]:: |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 578 | --template=<template_directory>:: |
| 579 | Only used with the 'init' command. |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 580 | These are passed directly to 'git init'. |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 581 | |
Michael J Gruber | 3b0d240 | 2011-02-17 08:48:06 +0100 | [diff] [blame] | 582 | -r <arg>:: |
| 583 | --revision <arg>:: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 584 | Used with the 'fetch' command. |
| 585 | + |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 586 | This allows revision ranges for partial/cauterized history |
| 587 | to be supported. $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges), |
| 588 | $NUMBER:HEAD, and BASE:$NUMBER are all supported. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 589 | + |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 590 | This can allow you to make partial mirrors when running fetch; |
| 591 | but is generally not recommended because history will be skipped |
| 592 | and lost. |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 593 | |
| 594 | -:: |
| 595 | --stdin:: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 596 | Only used with the 'set-tree' command. |
| 597 | + |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 598 | Read a list of commits from stdin and commit them in reverse |
| 599 | order. Only the leading sha1 is read from each line, so |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 600 | 'git rev-list --pretty=oneline' output can be used. |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 601 | |
| 602 | --rmdir:: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 603 | Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands. |
| 604 | + |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 605 | Remove directories from the SVN tree if there are no files left |
| 606 | behind. SVN can version empty directories, and they are not |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 607 | removed by default if there are no files left in them. Git |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 608 | cannot version empty directories. Enabling this flag will make |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 609 | the commit to SVN act like Git. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 610 | + |
| 611 | [verse] |
Tom Prince | e0d10e1 | 2007-01-28 16:16:53 -0800 | [diff] [blame] | 612 | config key: svn.rmdir |
Eric Wong | 20b1d70 | 2006-04-01 18:25:03 -0800 | [diff] [blame] | 613 | |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 614 | -e:: |
| 615 | --edit:: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 616 | Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands. |
| 617 | + |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 618 | Edit the commit message before committing to SVN. This is off by |
| 619 | default for objects that are commits, and forced on when committing |
| 620 | tree objects. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 621 | + |
| 622 | [verse] |
Tom Prince | e0d10e1 | 2007-01-28 16:16:53 -0800 | [diff] [blame] | 623 | config key: svn.edit |
Eric Wong | 20b1d70 | 2006-04-01 18:25:03 -0800 | [diff] [blame] | 624 | |
Eric Wong | 7294293 | 2006-02-20 10:57:26 -0800 | [diff] [blame] | 625 | -l<num>:: |
| 626 | --find-copies-harder:: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 627 | Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands. |
| 628 | + |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 629 | They are both passed directly to 'git diff-tree'; see |
Dan McGee | 5162e69 | 2007-12-29 00:20:38 -0600 | [diff] [blame] | 630 | linkgit:git-diff-tree[1] for more information. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 631 | + |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 632 | [verse] |
Tom Prince | e0d10e1 | 2007-01-28 16:16:53 -0800 | [diff] [blame] | 633 | config key: svn.l |
| 634 | config key: svn.findcopiesharder |
Eric Wong | 20b1d70 | 2006-04-01 18:25:03 -0800 | [diff] [blame] | 635 | |
Eric Wong | 81c5a0e | 2006-05-05 12:35:39 -0700 | [diff] [blame] | 636 | -A<filename>:: |
| 637 | --authors-file=<filename>:: |
Andreas Heiduk | cb427e9 | 2018-03-24 11:20:46 +0100 | [diff] [blame] | 638 | Syntax is compatible with the file used by 'git cvsimport' but |
| 639 | an empty email address can be supplied with '<>': |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 640 | + |
Eric Wong | 81c5a0e | 2006-05-05 12:35:39 -0700 | [diff] [blame] | 641 | ------------------------------------------------------------------------ |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 642 | loginname = Joe User <user@example.com> |
Eric Wong | 81c5a0e | 2006-05-05 12:35:39 -0700 | [diff] [blame] | 643 | ------------------------------------------------------------------------ |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 644 | + |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 645 | If this option is specified and 'git svn' encounters an SVN |
| 646 | committer name that does not exist in the authors-file, 'git svn' |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 647 | will abort operation. The user will then have to add the |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 648 | appropriate entry. Re-running the previous 'git svn' command |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 649 | after the authors-file is modified should continue operation. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 650 | + |
| 651 | [verse] |
Tom Prince | e0d10e1 | 2007-01-28 16:16:53 -0800 | [diff] [blame] | 652 | config key: svn.authorsfile |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 653 | |
Mark Lodato | 36db1ed | 2009-05-14 21:27:15 -0400 | [diff] [blame] | 654 | --authors-prog=<filename>:: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 655 | If this option is specified, for each SVN committer name that |
| 656 | does not exist in the authors file, the given file is executed |
| 657 | with the committer name as the first argument. The program is |
Andreas Heiduk | cb427e9 | 2018-03-24 11:20:46 +0100 | [diff] [blame] | 658 | expected to return a single line of the form "Name <email>" or |
| 659 | "Name <>", which will be treated as if included in the authors |
| 660 | file. |
Eric Wong | cec9264 | 2016-07-19 10:02:39 +0000 | [diff] [blame] | 661 | + |
Andreas Heiduk | 9c18398 | 2018-03-04 12:22:36 +0100 | [diff] [blame] | 662 | Due to historical reasons a relative 'filename' is first searched |
| 663 | relative to the current directory for 'init' and 'clone' and relative |
| 664 | to the root of the working tree for 'fetch'. If 'filename' is |
| 665 | not found, it is searched like any other command in '$PATH'. |
| 666 | + |
Eric Wong | cec9264 | 2016-07-19 10:02:39 +0000 | [diff] [blame] | 667 | [verse] |
| 668 | config key: svn.authorsProg |
Mark Lodato | 36db1ed | 2009-05-14 21:27:15 -0400 | [diff] [blame] | 669 | |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 670 | -q:: |
| 671 | --quiet:: |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 672 | Make 'git svn' less verbose. Specify a second time to make it |
Simon Arlott | 49750f3 | 2009-03-30 19:31:41 +0100 | [diff] [blame] | 673 | even less verbose. |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 674 | |
Eric Wong | b22d449 | 2006-08-26 00:01:23 -0700 | [diff] [blame] | 675 | -m:: |
| 676 | --merge:: |
| 677 | -s<strategy>:: |
| 678 | --strategy=<strategy>:: |
Avishay Lavie | b64e1f5 | 2012-05-15 11:45:50 +0300 | [diff] [blame] | 679 | -p:: |
Johannes Schindelin | ea8b7be | 2019-11-22 22:59:29 +0000 | [diff] [blame] | 680 | --rebase-merges:: |
| 681 | --preserve-merges (DEPRECATED):: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 682 | These are only used with the 'dcommit' and 'rebase' commands. |
| 683 | + |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 684 | Passed directly to 'git rebase' when using 'dcommit' if a |
| 685 | 'git reset' cannot be used (see 'dcommit'). |
Eric Wong | b22d449 | 2006-08-26 00:01:23 -0700 | [diff] [blame] | 686 | |
| 687 | -n:: |
| 688 | --dry-run:: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 689 | This can be used with the 'dcommit', 'rebase', 'branch' and |
| 690 | 'tag' commands. |
| 691 | + |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 692 | For 'dcommit', print out the series of Git arguments that would show |
Eric Wong | b22d449 | 2006-08-26 00:01:23 -0700 | [diff] [blame] | 693 | which diffs would be committed to SVN. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 694 | + |
Seth Falcon | 7d45e14 | 2008-05-19 20:29:17 -0700 | [diff] [blame] | 695 | For 'rebase', display the local branch associated with the upstream svn |
| 696 | repository associated with the current branch and the URL of svn |
| 697 | repository that will be fetched from. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 698 | + |
Florian Ragwitz | 5de70ef | 2008-10-04 19:35:17 -0700 | [diff] [blame] | 699 | For 'branch' and 'tag', display the urls that will be used for copying when |
| 700 | creating the branch or tag. |
| 701 | |
Valentin Haenel | c88d18f | 2011-04-26 13:34:18 +0200 | [diff] [blame] | 702 | --use-log-author:: |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 703 | When retrieving svn commits into Git (as part of 'fetch', 'rebase', or |
Valentin Haenel | 7733b27 | 2011-04-26 13:34:19 +0200 | [diff] [blame] | 704 | 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line |
Valentin Haenel | c88d18f | 2011-04-26 13:34:18 +0200 | [diff] [blame] | 705 | in the log message and use that as the author string. |
Eric Wong | ea9a93d | 2016-12-11 00:06:46 +0000 | [diff] [blame] | 706 | + |
| 707 | [verse] |
| 708 | config key: svn.useLogAuthor |
| 709 | |
Valentin Haenel | c88d18f | 2011-04-26 13:34:18 +0200 | [diff] [blame] | 710 | --add-author-from:: |
Andreas Heiduk | 43d7f2d | 2018-05-03 20:48:28 +0200 | [diff] [blame] | 711 | When committing to svn from Git (as part of 'set-tree' or 'dcommit' |
Valentin Haenel | c88d18f | 2011-04-26 13:34:18 +0200 | [diff] [blame] | 712 | operations), if the existing log message doesn't already have a |
Valentin Haenel | 7733b27 | 2011-04-26 13:34:19 +0200 | [diff] [blame] | 713 | `From:` or `Signed-off-by:` line, append a `From:` line based on the |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 714 | Git commit's author string. If you use this, then `--use-log-author` |
Valentin Haenel | c88d18f | 2011-04-26 13:34:18 +0200 | [diff] [blame] | 715 | will retrieve a valid author string for all commits. |
Eric Wong | ea9a93d | 2016-12-11 00:06:46 +0000 | [diff] [blame] | 716 | + |
| 717 | [verse] |
| 718 | config key: svn.addAuthorFrom |
Eric Wong | 81c5a0e | 2006-05-05 12:35:39 -0700 | [diff] [blame] | 719 | |
Eric Wong | 448c81b | 2006-03-03 01:20:09 -0800 | [diff] [blame] | 720 | ADVANCED OPTIONS |
| 721 | ---------------- |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 722 | |
Eric Wong | 448c81b | 2006-03-03 01:20:09 -0800 | [diff] [blame] | 723 | -i<GIT_SVN_ID>:: |
| 724 | --id <GIT_SVN_ID>:: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 725 | This sets GIT_SVN_ID (instead of using the environment). This |
| 726 | allows the user to override the default refname to fetch from |
| 727 | when tracking a single URL. The 'log' and 'dcommit' commands |
| 728 | no longer require this switch as an argument. |
Jonas Fonseca | 0ea4d4c | 2006-08-25 03:07:46 +0200 | [diff] [blame] | 729 | |
Eric Wong | 9760adc | 2007-01-31 03:06:56 -0800 | [diff] [blame] | 730 | -R<remote name>:: |
| 731 | --svn-remote <remote name>:: |
| 732 | Specify the [svn-remote "<remote name>"] section to use, |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 733 | this allows SVN multiple repositories to be tracked. |
| 734 | Default: "svn" |
Eric Wong | 9760adc | 2007-01-31 03:06:56 -0800 | [diff] [blame] | 735 | |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 736 | --follow-parent:: |
Sebastian Leske | 0d35bfe | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 737 | This option is only relevant if we are tracking branches (using |
| 738 | one of the repository layout options --trunk, --tags, |
| 739 | --branches, --stdlayout). For each tracked branch, try to find |
| 740 | out where its revision was copied from, and set |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 741 | a suitable parent in the first Git commit for the branch. |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 742 | This is especially helpful when we're tracking a directory |
Sebastian Leske | 0d35bfe | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 743 | that has been moved around within the repository. If this |
| 744 | feature is disabled, the branches created by 'git svn' will all |
| 745 | be linear and not share any history, meaning that there will be |
| 746 | no information on where branches were branched off or merged. |
| 747 | However, following long/convoluted histories can take a long |
| 748 | time, so disabling this feature may speed up the cloning |
| 749 | process. This feature is enabled by default, use |
Eric Wong | 0bed5ea | 2007-02-09 02:45:03 -0800 | [diff] [blame] | 750 | --no-follow-parent to disable it. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 751 | + |
| 752 | [verse] |
Tom Prince | e0d10e1 | 2007-01-28 16:16:53 -0800 | [diff] [blame] | 753 | config key: svn.followparent |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 754 | |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 755 | CONFIG FILE-ONLY OPTIONS |
| 756 | ------------------------ |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 757 | |
Eric Wong | 0dfaf0a | 2007-02-18 02:34:09 -0800 | [diff] [blame] | 758 | svn.noMetadata:: |
| 759 | svn-remote.<name>.noMetadata:: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 760 | This gets rid of the 'git-svn-id:' lines at the end of every commit. |
| 761 | + |
Eric Wong | c9be27f | 2010-08-21 18:52:14 +0000 | [diff] [blame] | 762 | This option can only be used for one-shot imports as 'git svn' |
| 763 | will not be able to fetch again without metadata. Additionally, |
Martin Ågren | 4c8b882 | 2019-03-06 07:30:17 +0100 | [diff] [blame] | 764 | if you lose your '$GIT_DIR/svn/\**/.rev_map.*' files, 'git svn' will not |
Eric Wong | c9be27f | 2010-08-21 18:52:14 +0000 | [diff] [blame] | 765 | be able to rebuild them. |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 766 | + |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 767 | The 'git svn log' command will not work on repositories using |
Sergey Vlasov | 112f638 | 2007-03-01 22:41:17 +0300 | [diff] [blame] | 768 | this, either. Using this conflicts with the 'useSvmProps' |
| 769 | option for (hopefully) obvious reasons. |
Eric Wong | c9be27f | 2010-08-21 18:52:14 +0000 | [diff] [blame] | 770 | + |
| 771 | This option is NOT recommended as it makes it difficult to track down |
| 772 | old references to SVN revision numbers in existing documentation, bug |
Elijah Newren | 9df53c5 | 2019-09-04 15:32:38 -0700 | [diff] [blame] | 773 | reports, and archives. If you plan to eventually migrate from SVN to |
| 774 | Git and are certain about dropping SVN history, consider |
| 775 | https://github.com/newren/git-filter-repo[git-filter-repo] instead. |
| 776 | filter-repo also allows reformatting of metadata for ease-of-reading |
| 777 | and rewriting authorship info for non-"svn.authorsFile" users. |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 778 | |
Eric Wong | 0dfaf0a | 2007-02-18 02:34:09 -0800 | [diff] [blame] | 779 | svn.useSvmProps:: |
| 780 | svn-remote.<name>.useSvmProps:: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 781 | This allows 'git svn' to re-map repository URLs and UUIDs from |
| 782 | mirrors created using SVN::Mirror (or svk) for metadata. |
| 783 | + |
Sergey Vlasov | 112f638 | 2007-03-01 22:41:17 +0300 | [diff] [blame] | 784 | If an SVN revision has a property, "svm:headrev", it is likely |
| 785 | that the revision was created by SVN::Mirror (also used by SVK). |
| 786 | The property contains a repository UUID and a revision. We want |
| 787 | to make it look like we are mirroring the original URL, so |
| 788 | introduce a helper function that returns the original identity |
| 789 | URL and UUID, and use it when generating metadata in commit |
| 790 | messages. |
Eric Wong | 97ae091 | 2007-02-11 15:21:24 -0800 | [diff] [blame] | 791 | |
Eric Wong | 0dfaf0a | 2007-02-18 02:34:09 -0800 | [diff] [blame] | 792 | svn.useSvnsyncProps:: |
| 793 | svn-remote.<name>.useSvnsyncprops:: |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 794 | Similar to the useSvmProps option; this is for users |
| 795 | of the svnsync(1) command distributed with SVN 1.4.x and |
| 796 | later. |
| 797 | |
Eric Wong | 0dfaf0a | 2007-02-18 02:34:09 -0800 | [diff] [blame] | 798 | svn-remote.<name>.rewriteRoot:: |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 799 | This allows users to create repositories from alternate |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 800 | URLs. For example, an administrator could run 'git svn' on the |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 801 | server locally (accessing via file://) but wish to distribute |
| 802 | the repository with a public http:// or svn:// URL in the |
| 803 | metadata so users of it will see the public URL. |
| 804 | |
Jay Soffian | 3e18ce1 | 2010-01-23 03:30:00 -0500 | [diff] [blame] | 805 | svn-remote.<name>.rewriteUUID:: |
| 806 | Similar to the useSvmProps option; this is for users who need |
| 807 | to remap the UUID manually. This may be useful in situations |
| 808 | where the original UUID is not available via either useSvmProps |
| 809 | or useSvnsyncProps. |
| 810 | |
Alejandro R. Sedeño | 12a296b | 2011-04-08 10:57:54 -0400 | [diff] [blame] | 811 | svn-remote.<name>.pushurl:: |
| 812 | |
Tom Russello | ae9f631 | 2016-06-08 19:23:16 +0200 | [diff] [blame] | 813 | Similar to Git's `remote.<name>.pushurl`, this key is designed |
Alejandro R. Sedeño | 12a296b | 2011-04-08 10:57:54 -0400 | [diff] [blame] | 814 | to be used in cases where 'url' points to an SVN repository |
| 815 | via a read-only transport, to provide an alternate read/write |
| 816 | transport. It is assumed that both keys point to the same |
| 817 | repository. Unlike 'commiturl', 'pushurl' is a base path. If |
| 818 | either 'commiturl' or 'pushurl' could be used, 'commiturl' |
| 819 | takes precedence. |
| 820 | |
Eric Wong | 4c58a71 | 2009-01-31 17:31:12 -0800 | [diff] [blame] | 821 | svn.brokenSymlinkWorkaround:: |
Yann Dirson | 6c32a7a | 2009-07-07 22:22:20 +0200 | [diff] [blame] | 822 | This disables potentially expensive checks to workaround |
| 823 | broken symlinks checked into SVN by broken clients. Set this |
| 824 | option to "false" if you track a SVN repository with many |
| 825 | empty blobs that are not symlinks. This option may be changed |
| 826 | while 'git svn' is running and take effect on the next |
| 827 | revision fetched. If unset, 'git svn' assumes this option to |
| 828 | be "true". |
Jan Krüger | 3b2bbe9 | 2008-06-20 00:41:42 +0200 | [diff] [blame] | 829 | |
Dmitry Statyvka | 3713e22 | 2010-07-30 04:30:13 +0200 | [diff] [blame] | 830 | svn.pathnameencoding:: |
| 831 | This instructs git svn to recode pathnames to a given encoding. |
| 832 | It can be used by windows users and by those who work in non-utf8 |
| 833 | locales to avoid corrupted file names with non-ASCII characters. |
| 834 | Valid encodings are the ones supported by Perl's Encode module. |
| 835 | |
Michael Haggerty | 55f9d7a | 2011-04-01 12:26:00 +0200 | [diff] [blame] | 836 | svn-remote.<name>.automkdirs:: |
| 837 | Normally, the "git svn clone" and "git svn rebase" commands |
| 838 | attempt to recreate empty directories that are in the |
| 839 | Subversion repository. If this option is set to "false", then |
| 840 | empty directories will only be created if the "git svn mkdirs" |
| 841 | command is run explicitly. If unset, 'git svn' assumes this |
| 842 | option to be "true". |
| 843 | |
Jay Soffian | 3e18ce1 | 2010-01-23 03:30:00 -0500 | [diff] [blame] | 844 | Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 845 | options all affect the metadata generated and used by 'git svn'; they |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 846 | *must* be set in the configuration file before any history is imported |
| 847 | and these settings should never be changed once they are set. |
| 848 | |
Jay Soffian | 3e18ce1 | 2010-01-23 03:30:00 -0500 | [diff] [blame] | 849 | Additionally, only one of these options can be used per svn-remote |
| 850 | section because they affect the 'git-svn-id:' metadata line, except |
| 851 | for rewriteRoot and rewriteUUID which can be used together. |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 852 | |
Eric Wong | 448c81b | 2006-03-03 01:20:09 -0800 | [diff] [blame] | 853 | |
Sergey Vlasov | 112f638 | 2007-03-01 22:41:17 +0300 | [diff] [blame] | 854 | BASIC EXAMPLES |
| 855 | -------------- |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 856 | |
Sebastian Leske | 92166fd | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 857 | Tracking and contributing to the trunk of a Subversion-managed project |
| 858 | (ignoring tags and branches): |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 859 | |
Eric Wong | 20b1d70 | 2006-04-01 18:25:03 -0800 | [diff] [blame] | 860 | ------------------------------------------------------------------------ |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 861 | # Clone a repo (like git clone): |
Michael Prokop | 2670ddc | 2008-09-30 01:01:34 +0200 | [diff] [blame] | 862 | git svn clone http://svn.example.com/project/trunk |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 863 | # Enter the newly cloned directory: |
| 864 | cd trunk |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 865 | # You should be on master branch, double-check with 'git branch' |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 866 | git branch |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 867 | # Do some work and commit locally to Git: |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 868 | git commit ... |
| 869 | # Something is committed to SVN, rebase your local changes against the |
| 870 | # latest changes in SVN: |
Jonathan Nieder | b1889c3 | 2008-06-30 01:09:04 -0500 | [diff] [blame] | 871 | git svn rebase |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 872 | # Now commit your changes (that were committed previously using Git) to SVN, |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 873 | # as well as automatically updating your working HEAD: |
Jonathan Nieder | b1889c3 | 2008-06-30 01:09:04 -0500 | [diff] [blame] | 874 | git svn dcommit |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 875 | # Append svn:ignore settings to the default Git exclude file: |
Jonathan Nieder | b1889c3 | 2008-06-30 01:09:04 -0500 | [diff] [blame] | 876 | git svn show-ignore >> .git/info/exclude |
Eric Wong | 20b1d70 | 2006-04-01 18:25:03 -0800 | [diff] [blame] | 877 | ------------------------------------------------------------------------ |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 878 | |
Eric Wong | 0d313b2 | 2007-01-04 18:04:06 -0800 | [diff] [blame] | 879 | Tracking and contributing to an entire Subversion-managed project |
| 880 | (complete with a trunk, tags and branches): |
Eric Wong | 0d313b2 | 2007-01-04 18:04:06 -0800 | [diff] [blame] | 881 | |
| 882 | ------------------------------------------------------------------------ |
Sebastian Leske | 92166fd | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 883 | # Clone a repo with standard SVN directory layout (like git clone): |
Johan Herland | 7091a2d | 2013-10-11 14:57:05 +0200 | [diff] [blame] | 884 | git svn clone http://svn.example.com/project --stdlayout --prefix svn/ |
Sebastian Leske | 92166fd | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 885 | # Or, if the repo uses a non-standard directory layout: |
Johan Herland | 7091a2d | 2013-10-11 14:57:05 +0200 | [diff] [blame] | 886 | git svn clone http://svn.example.com/project -T tr -b branch -t tag --prefix svn/ |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 887 | # View all branches and tags you have cloned: |
| 888 | git branch -r |
Florian Ragwitz | 5de70ef | 2008-10-04 19:35:17 -0700 | [diff] [blame] | 889 | # Create a new branch in SVN |
Stefan Beller | 3c123fb | 2013-10-21 21:36:06 +0200 | [diff] [blame] | 890 | git svn branch waldo |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 891 | # Reset your master to trunk (or any other branch, replacing 'trunk' |
| 892 | # with the appropriate name): |
Johan Herland | 7091a2d | 2013-10-11 14:57:05 +0200 | [diff] [blame] | 893 | git reset --hard svn/trunk |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 894 | # You may only dcommit to one branch/tag/trunk at a time. The usage |
Michael Coleman | 20f50f1 | 2007-02-28 23:14:23 -0600 | [diff] [blame] | 895 | # of dcommit/rebase/show-ignore should be the same as above. |
Eric Wong | 0d313b2 | 2007-01-04 18:04:06 -0800 | [diff] [blame] | 896 | ------------------------------------------------------------------------ |
| 897 | |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 898 | The initial 'git svn clone' can be quite time-consuming |
Adam Roben | 7d4aef4 | 2007-08-06 01:16:43 -0700 | [diff] [blame] | 899 | (especially for large Subversion repositories). If multiple |
| 900 | people (or one person with multiple machines) want to use |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 901 | 'git svn' to interact with the same Subversion repository, you can |
| 902 | do the initial 'git svn clone' to a repository on a server and |
| 903 | have each person clone that repository with 'git clone': |
Adam Roben | 7d4aef4 | 2007-08-06 01:16:43 -0700 | [diff] [blame] | 904 | |
| 905 | ------------------------------------------------------------------------ |
| 906 | # Do the initial import on a server |
Johan Herland | 7091a2d | 2013-10-11 14:57:05 +0200 | [diff] [blame] | 907 | ssh server "cd /pub && git svn clone http://svn.example.com/project [options...]" |
Sam Vilain | 2b0d103 | 2008-01-25 12:10:02 +1300 | [diff] [blame] | 908 | # Clone locally - make sure the refs/remotes/ space matches the server |
| 909 | mkdir project |
| 910 | cd project |
Jonathan Nieder | b1889c3 | 2008-06-30 01:09:04 -0500 | [diff] [blame] | 911 | git init |
Sam Vilain | 2b0d103 | 2008-01-25 12:10:02 +1300 | [diff] [blame] | 912 | git remote add origin server:/pub/project |
StephenB | 9cfdbf9 | 2011-01-06 19:06:51 +0000 | [diff] [blame] | 913 | git config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*' |
Sam Vilain | 2b0d103 | 2008-01-25 12:10:02 +1300 | [diff] [blame] | 914 | git fetch |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 915 | # Prevent fetch/pull from remote Git server in the future, |
StephenB | 9cfdbf9 | 2011-01-06 19:06:51 +0000 | [diff] [blame] | 916 | # we only want to use git svn for future updates |
| 917 | git config --remove-section remote.origin |
Jan Krüger | 9e77353 | 2008-11-14 18:45:14 +0100 | [diff] [blame] | 918 | # Create a local branch from one of the branches just fetched |
| 919 | git checkout -b master FETCH_HEAD |
Johan Herland | 7091a2d | 2013-10-11 14:57:05 +0200 | [diff] [blame] | 920 | # Initialize 'git svn' locally (be sure to use the same URL and |
| 921 | # --stdlayout/-T/-b/-t/--prefix options as were used on server) |
| 922 | git svn init http://svn.example.com/project [options...] |
Adam Roben | 7d4aef4 | 2007-08-06 01:16:43 -0700 | [diff] [blame] | 923 | # Pull the latest changes from Subversion |
Jonathan Nieder | b1889c3 | 2008-06-30 01:09:04 -0500 | [diff] [blame] | 924 | git svn rebase |
Adam Roben | 7d4aef4 | 2007-08-06 01:16:43 -0700 | [diff] [blame] | 925 | ------------------------------------------------------------------------ |
| 926 | |
Eric Wong | 2eff142 | 2007-01-06 17:53:40 -0800 | [diff] [blame] | 927 | REBASE VS. PULL/MERGE |
| 928 | --------------------- |
Jon Seymour | 2b26b65f | 2012-05-17 13:20:43 +1000 | [diff] [blame] | 929 | Prefer to use 'git svn rebase' or 'git rebase', rather than |
| 930 | 'git pull' or 'git merge' to synchronize unintegrated commits with a 'git svn' |
| 931 | branch. Doing so will keep the history of unintegrated commits linear with |
| 932 | respect to the upstream SVN repository and allow the use of the preferred |
| 933 | 'git svn dcommit' subcommand to push unintegrated commits back into SVN. |
Eric Wong | 2e93115 | 2006-08-25 12:48:23 -0700 | [diff] [blame] | 934 | |
Jon Seymour | 2b26b65f | 2012-05-17 13:20:43 +1000 | [diff] [blame] | 935 | Originally, 'git svn' recommended that developers pulled or merged from |
| 936 | the 'git svn' branch. This was because the author favored |
Jonathan Nieder | 483bc4f | 2008-06-30 13:56:34 -0500 | [diff] [blame] | 937 | `git svn set-tree B` to commit a single head rather than the |
Jon Seymour | 2b26b65f | 2012-05-17 13:20:43 +1000 | [diff] [blame] | 938 | `git svn set-tree A..B` notation to commit multiple commits. Use of |
| 939 | 'git pull' or 'git merge' with `git svn set-tree A..B` will cause non-linear |
| 940 | history to be flattened when committing into SVN and this can lead to merge |
| 941 | commits unexpectedly reversing previous commits in SVN. |
Eric Wong | 2e93115 | 2006-08-25 12:48:23 -0700 | [diff] [blame] | 942 | |
Stefan Sperling | fd91d26 | 2011-04-19 11:06:46 +0200 | [diff] [blame] | 943 | MERGE TRACKING |
| 944 | -------------- |
| 945 | While 'git svn' can track |
Eric Wong | bd43098 | 2007-09-18 16:50:42 -0700 | [diff] [blame] | 946 | copy history (including branches and tags) for repositories adopting a |
| 947 | standard layout, it cannot yet represent merge history that happened |
| 948 | inside git back upstream to SVN users. Therefore it is advised that |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 949 | users keep history as linear as possible inside Git to ease |
Eric Wong | bd43098 | 2007-09-18 16:50:42 -0700 | [diff] [blame] | 950 | compatibility with SVN (see the CAVEATS section below). |
Eric Wong | 1d52aba | 2006-03-09 03:48:47 -0800 | [diff] [blame] | 951 | |
Sebastian Leske | 7cad29d | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 952 | HANDLING OF SVN BRANCHES |
| 953 | ------------------------ |
| 954 | If 'git svn' is configured to fetch branches (and --follow-branches |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 955 | is in effect), it sometimes creates multiple Git branches for one |
Stefano Lattarini | e1c3bf4 | 2013-04-12 00:36:10 +0200 | [diff] [blame] | 956 | SVN branch, where the additional branches have names of the form |
Sebastian Leske | 7cad29d | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 957 | 'branchname@nnn' (with nnn an SVN revision number). These additional |
| 958 | branches are created if 'git svn' cannot find a parent commit for the |
| 959 | first commit in an SVN branch, to connect the branch to the history of |
| 960 | the other branches. |
| 961 | |
| 962 | Normally, the first commit in an SVN branch consists |
| 963 | of a copy operation. 'git svn' will read this commit to get the SVN |
| 964 | revision the branch was created from. It will then try to find the |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 965 | Git commit that corresponds to this SVN revision, and use that as the |
Sebastian Leske | 7cad29d | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 966 | parent of the branch. However, it is possible that there is no suitable |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 967 | Git commit to serve as parent. This will happen, among other reasons, |
Sebastian Leske | 7cad29d | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 968 | if the SVN branch is a copy of a revision that was not fetched by 'git |
| 969 | svn' (e.g. because it is an old revision that was skipped with |
Matthieu Moy | bcf9626 | 2016-06-28 13:40:11 +0200 | [diff] [blame] | 970 | `--revision`), or if in SVN a directory was copied that is not tracked |
Sebastian Leske | 7cad29d | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 971 | by 'git svn' (such as a branch that is not tracked at all, or a |
| 972 | subdirectory of a tracked branch). In these cases, 'git svn' will still |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 973 | create a Git branch, but instead of using an existing Git commit as the |
Sebastian Leske | 7cad29d | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 974 | parent of the branch, it will read the SVN history of the directory the |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 975 | branch was copied from and create appropriate Git commits. This is |
Sebastian Leske | 7cad29d | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 976 | indicated by the message "Initializing parent: <branchname>". |
| 977 | |
| 978 | Additionally, it will create a special branch named |
| 979 | '<branchname>@<SVN-Revision>', where <SVN-Revision> is the SVN revision |
| 980 | number the branch was copied from. This branch will point to the newly |
| 981 | created parent commit of the branch. If in SVN the branch was deleted |
| 982 | and later recreated from a different version, there will be multiple |
| 983 | such branches with an '@'. |
| 984 | |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 985 | Note that this may mean that multiple Git commits are created for a |
Sebastian Leske | 7cad29d | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 986 | single SVN revision. |
| 987 | |
| 988 | An example: in an SVN repository with a standard |
| 989 | trunk/tags/branches layout, a directory trunk/sub is created in r.100. |
| 990 | In r.200, trunk/sub is branched by copying it to branches/. 'git svn |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 991 | clone -s' will then create a branch 'sub'. It will also create new Git |
Sebastian Leske | 7cad29d | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 992 | commits for r.100 through r.199 and use these as the history of branch |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 993 | 'sub'. Thus there will be two Git commits for each revision from r.100 |
Sebastian Leske | 7cad29d | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 994 | to r.199 (one containing trunk/, one containing trunk/sub/). Finally, |
| 995 | it will create a branch 'sub@200' pointing to the new parent commit of |
| 996 | branch 'sub' (i.e. the commit for r.200 and trunk/sub/). |
| 997 | |
Eric Wong | aabb2e5 | 2007-08-16 01:56:45 -0700 | [diff] [blame] | 998 | CAVEATS |
| 999 | ------- |
| 1000 | |
Stefan Sperling | fd91d26 | 2011-04-19 11:06:46 +0200 | [diff] [blame] | 1001 | For the sake of simplicity and interoperating with Subversion, |
| 1002 | it is recommended that all 'git svn' users clone, fetch and dcommit |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 1003 | directly from the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push' |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 1004 | operations between Git repositories and branches. The recommended |
| 1005 | method of exchanging code between Git branches and users is |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 1006 | 'git format-patch' and 'git am', or just 'dcommit'ing to the SVN repository. |
Eric Wong | aabb2e5 | 2007-08-16 01:56:45 -0700 | [diff] [blame] | 1007 | |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 1008 | Running 'git merge' or 'git pull' is NOT recommended on a branch you |
Stefan Sperling | fd91d26 | 2011-04-19 11:06:46 +0200 | [diff] [blame] | 1009 | plan to 'dcommit' from because Subversion users cannot see any |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 1010 | merges you've made. Furthermore, if you merge or pull from a Git branch |
Jonathan Nieder | 483bc4f | 2008-06-30 13:56:34 -0500 | [diff] [blame] | 1011 | that is a mirror of an SVN branch, 'dcommit' may commit to the wrong |
Eric Wong | aabb2e5 | 2007-08-16 01:56:45 -0700 | [diff] [blame] | 1012 | branch. |
| 1013 | |
Thomas Rast | ce45a45 | 2009-11-16 11:15:17 +0100 | [diff] [blame] | 1014 | If you do merge, note the following rule: 'git svn dcommit' will |
| 1015 | attempt to commit on top of the SVN commit named in |
| 1016 | ------------------------------------------------------------------------ |
| 1017 | git log --grep=^git-svn-id: --first-parent -1 |
| 1018 | ------------------------------------------------------------------------ |
| 1019 | You 'must' therefore ensure that the most recent commit of the branch |
| 1020 | you want to dcommit to is the 'first' parent of the merge. Chaos will |
| 1021 | ensue otherwise, especially if the first parent is an older commit on |
| 1022 | the same SVN branch. |
| 1023 | |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 1024 | 'git clone' does not clone branches under the refs/remotes/ hierarchy or |
| 1025 | any 'git svn' metadata, or config. So repositories created and managed with |
| 1026 | using 'git svn' should use 'rsync' for cloning, if cloning is to be done |
Eric Wong | aabb2e5 | 2007-08-16 01:56:45 -0700 | [diff] [blame] | 1027 | at all. |
| 1028 | |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 1029 | Since 'dcommit' uses rebase internally, any Git branches you 'git push' to |
Jonathan Nieder | 483bc4f | 2008-06-30 13:56:34 -0500 | [diff] [blame] | 1030 | before 'dcommit' on will require forcing an overwrite of the existing ref |
Eric Wong | aabb2e5 | 2007-08-16 01:56:45 -0700 | [diff] [blame] | 1031 | on the remote repository. This is generally considered bad practice, |
Jonathan Nieder | 483bc4f | 2008-06-30 13:56:34 -0500 | [diff] [blame] | 1032 | see the linkgit:git-push[1] documentation for details. |
Eric Wong | aabb2e5 | 2007-08-16 01:56:45 -0700 | [diff] [blame] | 1033 | |
Jonathan Nieder | 483bc4f | 2008-06-30 13:56:34 -0500 | [diff] [blame] | 1034 | Do not use the --amend option of linkgit:git-commit[1] on a change you've |
Eric Wong | aabb2e5 | 2007-08-16 01:56:45 -0700 | [diff] [blame] | 1035 | already dcommitted. It is considered bad practice to --amend commits |
| 1036 | you've already pushed to a remote repository for other users, and |
| 1037 | dcommit with SVN is analogous to that. |
| 1038 | |
Sebastian Leske | 92166fd | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 1039 | When cloning an SVN repository, if none of the options for describing |
| 1040 | the repository layout is used (--trunk, --tags, --branches, |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 1041 | --stdlayout), 'git svn clone' will create a Git repository with |
Sebastian Leske | 92166fd | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 1042 | completely linear history, where branches and tags appear as separate |
| 1043 | directories in the working copy. While this is the easiest way to get a |
| 1044 | copy of a complete repository, for projects with many branches it will |
| 1045 | lead to a working copy many times larger than just the trunk. Thus for |
| 1046 | projects using the standard directory structure (trunk/branches/tags), |
Matthieu Moy | bcf9626 | 2016-06-28 13:40:11 +0200 | [diff] [blame] | 1047 | it is recommended to clone with option `--stdlayout`. If the project |
Sebastian Leske | 92166fd | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 1048 | uses a non-standard structure, and/or if branches and tags are not |
| 1049 | required, it is easiest to only clone one directory (typically trunk), |
| 1050 | without giving any repository layout options. If the full history with |
Matthieu Moy | bcf9626 | 2016-06-28 13:40:11 +0200 | [diff] [blame] | 1051 | branches and tags is required, the options `--trunk` / `--branches` / |
| 1052 | `--tags` must be used. |
Sebastian Leske | 92166fd | 2012-11-30 08:16:30 +0100 | [diff] [blame] | 1053 | |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 1054 | When using multiple --branches or --tags, 'git svn' does not automatically |
Marc Branchaud | ab81a36 | 2009-06-26 16:49:19 -0400 | [diff] [blame] | 1055 | handle name collisions (for example, if two branches from different paths have |
| 1056 | the same name, or if a branch and a tag have the same name). In these cases, |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 1057 | use 'init' to set up your Git repository then, before your first 'fetch', edit |
Keshav Kini | 6fe7a30 | 2013-09-29 18:45:59 -0500 | [diff] [blame] | 1058 | the $GIT_DIR/config file so that the branches and tags are associated |
| 1059 | with different name spaces. For example: |
Marc Branchaud | ab81a36 | 2009-06-26 16:49:19 -0400 | [diff] [blame] | 1060 | |
| 1061 | branches = stable/*:refs/remotes/svn/stable/* |
| 1062 | branches = debug/*:refs/remotes/svn/debug/* |
| 1063 | |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 1064 | BUGS |
| 1065 | ---- |
Eric Wong | e8f5d90 | 2006-10-11 14:53:35 -0700 | [diff] [blame] | 1066 | |
Eric Wong | a81ed0b | 2007-02-18 02:10:51 -0800 | [diff] [blame] | 1067 | We ignore all SVN properties except svn:executable. Any unhandled |
| 1068 | properties are logged to $GIT_DIR/svn/<refname>/unhandled.log |
Eric Wong | 3397f9d | 2006-02-16 01:24:16 -0800 | [diff] [blame] | 1069 | |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 1070 | Renamed and copied directories are not detected by Git and hence not |
Eric Wong | bbe0c9b | 2006-02-20 10:57:28 -0800 | [diff] [blame] | 1071 | tracked when committing to SVN. I do not plan on adding support for |
| 1072 | this as it's quite difficult and time-consuming to get working for all |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 1073 | the possible corner cases (Git doesn't do it, either). Committing |
Stefan Sperling | fd91d26 | 2011-04-19 11:06:46 +0200 | [diff] [blame] | 1074 | renamed and copied files is fully supported if they're similar enough |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 1075 | for Git to detect them. |
Eric Wong | bbe0c9b | 2006-02-20 10:57:28 -0800 | [diff] [blame] | 1076 | |
Sebastian Leske | dd465ce | 2012-11-23 08:29:38 +0100 | [diff] [blame] | 1077 | In SVN, it is possible (though discouraged) to commit changes to a tag |
| 1078 | (because a tag is just a directory copy, thus technically the same as a |
| 1079 | branch). When cloning an SVN repository, 'git svn' cannot know if such a |
| 1080 | commit to a tag will happen in the future. Thus it acts conservatively |
| 1081 | and imports all SVN tags as branches, prefixing the tag name with 'tags/'. |
| 1082 | |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 1083 | CONFIGURATION |
| 1084 | ------------- |
| 1085 | |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 1086 | 'git svn' stores [svn-remote] configuration information in the |
Keshav Kini | 6fe7a30 | 2013-09-29 18:45:59 -0500 | [diff] [blame] | 1087 | repository $GIT_DIR/config file. It is similar the core Git |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 1088 | [remote] sections except 'fetch' keys do not accept glob |
| 1089 | arguments; but they are instead handled by the 'branches' |
| 1090 | and 'tags' keys. Since some SVN repositories are oddly |
| 1091 | configured with multiple projects glob expansions such those |
| 1092 | listed below are allowed: |
| 1093 | |
| 1094 | ------------------------------------------------------------------------ |
| 1095 | [svn-remote "project-a"] |
| 1096 | url = http://server.org/svn |
Wesley J. Landaker | 0e5e69a | 2009-04-01 16:05:01 -0600 | [diff] [blame] | 1097 | fetch = trunk/project-a:refs/remotes/project-a/trunk |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 1098 | branches = branches/*/project-a:refs/remotes/project-a/branches/* |
Victor Leschuk | e4e5dd9 | 2016-01-11 17:25:58 +0300 | [diff] [blame] | 1099 | branches = branches/release_*:refs/remotes/project-a/branches/release_* |
| 1100 | branches = branches/re*se:refs/remotes/project-a/branches/* |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 1101 | tags = tags/*/project-a:refs/remotes/project-a/tags/* |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 1102 | ------------------------------------------------------------------------ |
| 1103 | |
Todd Zullinger | 9e4cbcc | 2019-04-09 20:37:34 -0400 | [diff] [blame] | 1104 | Keep in mind that the `*` (asterisk) wildcard of the local ref |
| 1105 | (right of the `:`) *must* be the farthest right path component; |
Wesley J. Landaker | bad542f | 2009-04-22 09:48:58 -0600 | [diff] [blame] | 1106 | however the remote wildcard may be anywhere as long as it's an |
Todd Zullinger | 9e4cbcc | 2019-04-09 20:37:34 -0400 | [diff] [blame] | 1107 | independent path component (surrounded by `/` or EOL). This |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 1108 | type of configuration is not automatically created by 'init' and |
Yann Dirson | 647ac70 | 2009-07-07 22:22:19 +0200 | [diff] [blame] | 1109 | should be manually entered with a text-editor or using 'git config'. |
Eric Wong | a836a0e | 2007-02-14 19:34:56 -0800 | [diff] [blame] | 1110 | |
Victor Leschuk | e4e5dd9 | 2016-01-11 17:25:58 +0300 | [diff] [blame] | 1111 | Also note that only one asterisk is allowed per word. For example: |
| 1112 | |
| 1113 | branches = branches/re*se:refs/remotes/project-a/branches/* |
| 1114 | |
| 1115 | will match branches 'release', 'rese', 're123se', however |
| 1116 | |
| 1117 | branches = branches/re*s*e:refs/remotes/project-a/branches/* |
| 1118 | |
| 1119 | will produce an error. |
| 1120 | |
Jay Soffian | 0757620 | 2010-01-23 03:30:01 -0500 | [diff] [blame] | 1121 | It is also possible to fetch a subset of branches or tags by using a |
| 1122 | comma-separated list of names within braces. For example: |
| 1123 | |
| 1124 | ------------------------------------------------------------------------ |
| 1125 | [svn-remote "huge-project"] |
| 1126 | url = http://server.org/svn |
| 1127 | fetch = trunk/src:refs/remotes/trunk |
Johan Herland | 7091a2d | 2013-10-11 14:57:05 +0200 | [diff] [blame] | 1128 | branches = branches/{red,green}/src:refs/remotes/project-a/branches/* |
| 1129 | tags = tags/{1.0,2.0}/src:refs/remotes/project-a/tags/* |
Jay Soffian | 0757620 | 2010-01-23 03:30:01 -0500 | [diff] [blame] | 1130 | ------------------------------------------------------------------------ |
| 1131 | |
Nathan Gray | eff714b | 2011-12-19 19:23:50 -0600 | [diff] [blame] | 1132 | Multiple fetch, branches, and tags keys are supported: |
| 1133 | |
| 1134 | ------------------------------------------------------------------------ |
| 1135 | [svn-remote "messy-repo"] |
| 1136 | url = http://server.org/svn |
| 1137 | fetch = trunk/project-a:refs/remotes/project-a/trunk |
| 1138 | fetch = branches/demos/june-project-a-demo:refs/remotes/project-a/demos/june-demo |
| 1139 | branches = branches/server/*:refs/remotes/project-a/branches/* |
| 1140 | branches = branches/demos/2011/*:refs/remotes/project-a/2011-demos/* |
| 1141 | tags = tags/server/*:refs/remotes/project-a/tags/* |
| 1142 | ------------------------------------------------------------------------ |
| 1143 | |
Jonathan Nieder | 7d82b4a | 2011-12-19 19:24:30 -0600 | [diff] [blame] | 1144 | Creating a branch in such a configuration requires disambiguating which |
| 1145 | location to use using the -d or --destination flag: |
| 1146 | |
| 1147 | ------------------------------------------------------------------------ |
| 1148 | $ git svn branch -d branches/server release-2-3-0 |
| 1149 | ------------------------------------------------------------------------ |
| 1150 | |
Jay Soffian | 0757620 | 2010-01-23 03:30:01 -0500 | [diff] [blame] | 1151 | Note that git-svn keeps track of the highest revision in which a branch |
| 1152 | or tag has appeared. If the subset of branches or tags is changed after |
Keshav Kini | 6fe7a30 | 2013-09-29 18:45:59 -0500 | [diff] [blame] | 1153 | fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove |
| 1154 | (or reset) branches-maxRev and/or tags-maxRev as appropriate. |
Jay Soffian | 0757620 | 2010-01-23 03:30:01 -0500 | [diff] [blame] | 1155 | |
Keshav Kini | 945b9c1 | 2013-09-29 18:46:00 -0500 | [diff] [blame] | 1156 | FILES |
| 1157 | ----- |
Martin Ågren | 4c8b882 | 2019-03-06 07:30:17 +0100 | [diff] [blame] | 1158 | $GIT_DIR/svn/\**/.rev_map.*:: |
Keshav Kini | 945b9c1 | 2013-09-29 18:46:00 -0500 | [diff] [blame] | 1159 | Mapping between Subversion revision numbers and Git commit |
| 1160 | names. In a repository where the noMetadata option is not set, |
| 1161 | this can be rebuilt from the git-svn-id: lines that are at the |
| 1162 | end of every commit (see the 'svn.noMetadata' section above for |
| 1163 | details). |
| 1164 | + |
| 1165 | 'git svn fetch' and 'git svn rebase' automatically update the rev_map |
| 1166 | if it is missing or not up to date. 'git svn reset' automatically |
| 1167 | rewinds it. |
| 1168 | |
Eric Wong | 2e93115 | 2006-08-25 12:48:23 -0700 | [diff] [blame] | 1169 | SEE ALSO |
| 1170 | -------- |
Dan McGee | 5162e69 | 2007-12-29 00:20:38 -0600 | [diff] [blame] | 1171 | linkgit:git-rebase[1] |
Jeff King | 6ea922d | 2011-03-11 01:08:48 -0500 | [diff] [blame] | 1172 | |
| 1173 | GIT |
| 1174 | --- |
| 1175 | Part of the linkgit:git[1] suite |