| blob | 0c40633e61e5e25cd01901e4f465bdb55234b460 |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
129 }
133 }
135 /* Block element titles. */
143 }
146 }
150 }
153 }
156 }
162 }
168 }
176 }
181 }
185 }
189 }
190 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
193 }
202 }
206 }
211 }
217 dl {
220 }
221 dt {
226 }
229 }
233 }
236 }
239 }
242 }
245 }
248 }
255 }
259 }
263 }
264 tfoot {
266 }
269 }
272 }
273 /* Because the table frame attribute is overriden by CSS in most browsers. */
276 }
280 }
284 }
290 }
293 }
296 }
302 }
305 }
309 }
313 }
317 }
321 }
326 }
330 }
340 }
345 }
347 div#toc {
349 }
351 div#toctitle {
358 }
363 }
367 }
371 }
375 }
376 /* Overrides for manpage documents */
377 h1 {
382 }
383 h2 {
385 }
388 }
392 }
394 /* Workarounds for IE6's broken and incomplete CSS2. */
400 }
407 }
413 }
418 }
422 }
426 }
431 }
433 /* IE6 sets dynamically generated links as visited. */
435 </style>
437 /*<![CDATA[*/
441 /////////////////////////////////////////////////////////////////////
442 // Table Of Contents generator
443 /////////////////////////////////////////////////////////////////////
445 /* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
458 // toclevels = 1..4.
468 }
470 }
476 }
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
490 }
492 }
493 }
494 }
497 }
512 }
515 },
518 /////////////////////////////////////////////////////////////////////
519 // Footnotes generator
520 /////////////////////////////////////////////////////////////////////
522 /* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
547 }
548 }
552 // Process footnoterefs.
561 }
562 }
563 }
564 }
566 }
567 /*]]>*/
568 </script>
569 </head>
570 <body>
572 <h1>
573 git-svn(1) Manual Page
574 </h1>
577 <p>git-svn -
578 Bidirectional operation between a Subversion repository and git
579 </p>
580 </div>
581 </div>
588 </div></div>
589 </div>
592 <div class="paragraph"><p><em>git svn</em> is a simple conduit for changesets between Subversion and git.
593 It provides a bidirectional flow of changes between a Subversion and a git
594 repository.</p></div>
596 following the common "trunk/branches/tags" layout, with the --stdlayout option.
597 It can also follow branches and tags in any layout with the -T/-t/-b options
599 <div class="paragraph"><p>Once tracking a Subversion repository (with any of the above methods), the git
602 </div>
608 </dt>
609 <dd>
610 <p>
611 Initializes an empty git repository with additional
613 may be specified as a command-line argument, or as full
614 URL arguments to -T/-t/-b. Optionally, the target
615 directory to operate on can be specified as a second
616 argument. Normally this command initializes the current
617 directory.
618 </p>
622 </dt>
625 </dt>
628 </dt>
631 </dt>
634 </dt>
637 </dt>
639 -s
640 </dt>
642 --stdlayout
643 </dt>
644 <dd>
645 <p>
646 These are optional command-line options for init. Each of
647 these flags can point to a relative repository path
648 (--tags=project/tags) or a full url
649 (--tags=https://foo.org/project/tags).
650 You can specify more than one --tags and/or --branches options, in case
651 your Subversion repository places tags or branches under multiple paths.
652 The option --stdlayout is
653 a shorthand way of setting trunk,tags,branches as the relative paths,
654 which is the Subversion default. If any of the other options are given
655 as well, they take precedence.
656 </p>
657 </dd>
659 --no-metadata
660 </dt>
661 <dd>
662 <p>
665 section of this manpage before using this option.
666 </p>
667 </dd>
669 --use-svm-props
670 </dt>
671 <dd>
672 <p>
674 </p>
675 </dd>
677 --use-svnsync-props
678 </dt>
679 <dd>
680 <p>
682 </p>
683 </dd>
686 </dt>
687 <dd>
688 <p>
690 </p>
691 </dd>
694 </dt>
695 <dd>
696 <p>
698 </p>
699 </dd>
702 </dt>
703 <dd>
704 <p>
705 For transports that SVN handles authentication for (http,
706 https, and plain svn), specify the username. For other
707 transports (eg svn+ssh://), you must include the username in
708 the URL, eg svn+ssh://foo@svn.bar.com/project
709 </p>
710 </dd>
713 </dt>
714 <dd>
715 <p>
716 This allows one to specify a prefix which is prepended
717 to the names of remotes if trunk/branches/tags are
718 specified. The prefix does not automatically include a
719 trailing slash, so be sure you include one in the
720 argument if that is what you want. If --branches/-b is
721 specified, the prefix must include a trailing slash.
722 Setting a prefix is useful if you wish to track multiple
723 projects that share a common repository.
724 </p>
725 </dd>
728 </dt>
729 <dd>
730 <p>
734 </p>
735 </dd>
737 --no-minimize-url
738 </dt>
739 <dd>
740 <p>
741 When tracking multiple directories (using --stdlayout,
742 --branches, or --tags options), git svn will attempt to connect
743 to the root (or highest allowed level) of the Subversion
744 repository. This default allows better tracking of history if
745 entire projects are moved within a repository, but may cause
746 issues on repositories where read access restrictions are in
748 accept URLs as-is without attempting to connect to a higher
749 level directory. This option is off by default when only
750 one URL/branch is tracked (it would do little good).
751 </p>
752 </dd>
753 </dl></div>
754 </dd>
757 </dt>
758 <dd>
759 <p>
760 Fetch unfetched revisions from the Subversion remote we are
761 tracking. The name of the [svn-remote "…"] section in the
762 .git/config file may be specified as an optional command-line
763 argument.
764 </p>
767 --localtime
768 </dt>
769 <dd>
770 <p>
771 Store Git commit times in the local timezone instead of UTC. This
774 </p>
776 repository you cloned from, but if you wish for your local Git
777 repository to be able to interoperate with someone else’s local Git
778 repository, either don’t use this option or you should both use it in
779 the same local timezone.</p></div>
780 </dd>
782 --parent
783 </dt>
784 <dd>
785 <p>
786 Fetch only from the SVN parent of the current HEAD.
787 </p>
788 </dd>
791 </dt>
792 <dd>
793 <p>
794 This allows one to specify a Perl regular expression that will
795 cause skipping of all matching paths from checkout from SVN.
799 </p>
803 </div></div>
805 also given, both regular expressions will be used.</p></div>
809 Skip "doc*" directory for every fetch
810 </dt>
811 <dd>
815 </div></div>
816 </dd>
819 </dt>
820 <dd>
824 </div></div>
825 </dd>
826 </dl></div>
827 </dd>
828 </dl></div>
829 </dd>
832 </dt>
833 <dd>
834 <p>
836 directory based on the basename of the URL passed to it;
837 or if a second argument is passed; it will create a directory
838 and work within that. It accepts all arguments that the
843 able to update the working tree with the latest changes.
844 </p>
847 --preserve-empty-dirs
848 </dt>
849 <dd>
850 <p>
851 Create a placeholder file in the local Git repository for each
852 empty directory fetched from Subversion. This includes directories
853 that become empty by removing all entries in the Subversion
854 repository (but not the directory itself). The placeholder files
855 are also tracked and removed when no longer necessary.
856 </p>
857 </dd>
860 </dt>
861 <dd>
862 <p>
863 Set the name of placeholder files created by --preserve-empty-dirs.
864 Default: ".gitignore"
865 </p>
866 </dd>
867 </dl></div>
868 </dd>
871 </dt>
872 <dd>
873 <p>
874 This fetches revisions from the SVN parent of the current HEAD
875 and rebases the current (uncommitted to SVN) work against it.
876 </p>
877 <div class="paragraph"><p>This works similarly to <tt>svn update</tt> or <em>git pull</em> except that
880 <div class="paragraph"><p>This accepts all options that <em>git svn fetch</em> and <em>git rebase</em>
882 [svn-remote], and not all [svn-remote] definitions.</p></div>
883 <div class="paragraph"><p>Like <em>git rebase</em>; this requires that the working tree be clean
884 and have no uncommitted changes.</p></div>
887 -l
888 </dt>
890 --local
891 </dt>
892 <dd>
893 <p>
895 last fetched commit from the upstream SVN.
896 </p>
897 </dd>
898 </dl></div>
899 </dd>
902 </dt>
903 <dd>
904 <p>
905 Commit each diff from a specified head directly to the SVN
906 repository, and then rebase or reset (depending on whether or
907 not there is a diff between SVN and head). This will create
908 a revision in SVN for each commit in git.
910 pull or merge) your commits against the latest changes in the
911 SVN repository.
912 An optional revision or branch argument may be specified, and
914 instead of HEAD.
916 cleaner, more linear history.
917 </p>
920 --no-rebase
921 </dt>
922 <dd>
923 <p>
924 After committing, do not rebase or reset.
925 </p>
926 </dd>
929 </dt>
930 <dd>
931 <p>
932 Commit to this SVN URL (the full path). This is intended to
935 reused if a user is later given access to an alternate transport
937 </p>
942 </div></div>
943 <div class="paragraph"><p>Using this option for any other purpose (don’t ask) is very strongly
944 discouraged.</p></div>
945 </dd>
948 </dt>
949 <dd>
950 <p>
951 Add the given merge information during the dcommit
953 store this information (as a property), and svn clients starting from
954 version 1.5 can make use of it. To specify merge information from multiple
955 branches, use a single space character between the branches
957 </p>
961 </div></div>
962 <div class="paragraph"><p>This option will cause git-svn to attempt to automatically populate the
963 svn:mergeinfo property in the SVN repository when possible. Currently, this can
964 only be done when dcommitting non-fast-forward merges where all parents but the
965 first have already been pushed into SVN.</p></div>
966 </dd>
968 --interactive
969 </dt>
970 <dd>
971 <p>
972 Ask the user to confirm that a patch set should actually be sent to SVN.
975 <br />
977 commiting anything to SVN.
978 </p>
979 </dd>
980 </dl></div>
981 </dd>
984 </dt>
985 <dd>
986 <p>
987 Create a branch in the SVN repository.
988 </p>
991 -m
992 </dt>
994 --message
995 </dt>
996 <dd>
997 <p>
998 Allows to specify the commit message.
999 </p>
1000 </dd>
1002 -t
1003 </dt>
1005 --tag
1006 </dt>
1007 <dd>
1008 <p>
1009 Create a tag by using the tags_subdir instead of the branches_subdir
1010 specified during git svn init.
1011 </p>
1012 </dd>
1014 -d
1015 </dt>
1017 --destination
1018 </dt>
1019 <dd>
1020 <p>
1023 tag) you wish to create in the SVN repository. The value of this
1024 option must match one of the paths specified by a --branches (or
1025 --tags) option. You can see these paths with the commands
1026 </p>
1031 </div></div>
1032 <div class="paragraph"><p>where <name> is the name of the SVN repository as specified by the -R option to
1034 </dd>
1036 --username
1037 </dt>
1038 <dd>
1039 <p>
1040 Specify the SVN username to perform the commit as. This option overrides
1042 </p>
1043 </dd>
1045 --commit-url
1046 </dt>
1047 <dd>
1048 <p>
1049 Use the specified URL to connect to the destination Subversion
1050 repository. This is useful in cases where the source SVN
1051 repository is read-only. This option overrides configuration
1053 </p>
1057 </div></div>
1058 </dd>
1059 </dl></div>
1060 </dd>
1063 </dt>
1064 <dd>
1065 <p>
1066 Create a tag in the SVN repository. This is a shorthand for
1068 </p>
1069 </dd>
1072 </dt>
1073 <dd>
1074 <p>
1075 This should make it easy to look up svn log messages when svn
1076 users refer to -r/--revision numbers.
1077 </p>
1078 <div class="paragraph"><p>The following features from ‘svn log’ are supported:</p></div>
1082 </dt>
1085 </dt>
1086 <dd>
1087 <p>
1088 is supported, non-numeric args are not:
1089 HEAD, NEXT, BASE, PREV, etc …
1090 </p>
1091 </dd>
1093 -v
1094 </dt>
1096 --verbose
1097 </dt>
1098 <dd>
1099 <p>
1100 it’s not completely compatible with the --verbose
1101 output in svn log, but reasonably close.
1102 </p>
1103 </dd>
1106 </dt>
1107 <dd>
1108 <p>
1109 is NOT the same as --max-count, doesn’t count
1110 merged/excluded commits
1111 </p>
1112 </dd>
1114 --incremental
1115 </dt>
1116 <dd>
1117 <p>
1118 supported
1119 </p>
1120 </dd>
1121 </dl></div>
1125 --show-commit
1126 </dt>
1127 <dd>
1128 <p>
1129 shows the git commit sha1, as well
1130 </p>
1131 </dd>
1133 --oneline
1134 </dt>
1135 <dd>
1136 <p>
1137 our version of --pretty=oneline
1138 </p>
1139 </dd>
1140 </dl></div>
1142 <table><tr>
1145 </td>
1147 client converts the UTC time to the local time (or based on the TZ=
1148 environment). This command has the same behaviour.</td>
1149 </tr></table>
1150 </div>
1151 <div class="paragraph"><p>Any other arguments are passed directly to <em>git log</em></p></div>
1152 </dd>
1155 </dt>
1156 <dd>
1157 <p>
1158 Show what revision and author last modified each line of a file. The
1159 output of this mode is format-compatible with the output of
1161 local uncommitted changes in the working tree are ignored;
1162 the version of the file in the HEAD revision is annotated. Unknown
1164 </p>
1167 --git-format
1168 </dt>
1169 <dd>
1170 <p>
1172 SVN revision numbers instead of git commit hashes. In this mode,
1173 changes that haven’t been committed to SVN (including local
1174 working-copy edits) are shown as revision 0.
1175 </p>
1176 </dd>
1177 </dl></div>
1178 </dd>
1181 </dt>
1182 <dd>
1183 <p>
1185 corresponding git commit hash (this can optionally be followed by a
1186 tree-ish to specify which branch should be searched). When given a
1187 tree-ish, returns the corresponding SVN revision number.
1188 </p>
1189 </dd>
1192 </dt>
1193 <dd>
1194 <p>
1196 Commit specified commit or tree objects to SVN. This relies on
1197 your imported fetch data being up-to-date. This makes
1198 absolutely no attempts to do patching when committing to SVN, it
1199 simply overwrites files with those specified in the tree or
1200 commit. All merging is assumed to have taken place
1202 </p>
1203 </dd>
1206 </dt>
1207 <dd>
1208 <p>
1209 Recursively finds the svn:ignore property on directories and
1210 creates matching .gitignore files. The resulting files are staged to
1211 be committed, but are not committed. Use -r/--revision to refer to a
1212 specific revision.
1213 </p>
1214 </dd>
1217 </dt>
1218 <dd>
1219 <p>
1220 Recursively finds and lists the svn:ignore property on
1221 directories. The output is suitable for appending to
1222 the $GIT_DIR/info/exclude file.
1223 </p>
1224 </dd>
1227 </dt>
1228 <dd>
1229 <p>
1230 Attempts to recreate empty directories that core git cannot track
1232 Empty directories are automatically recreated when using
1236 more information.)
1237 </p>
1238 </dd>
1241 </dt>
1242 <dd>
1243 <p>
1244 Commits the diff of two tree-ish arguments from the
1245 command-line. This command does not rely on being inside an <tt>git svn
1246 init</tt>-ed repository. This command takes three arguments, (a) the
1247 original tree to diff against, (b) the new tree result, (c) the
1248 URL of the target Subversion repository. The final argument
1252 </p>
1253 </dd>
1256 </dt>
1257 <dd>
1258 <p>
1259 Shows information about a file or directory similar to what
1261 argument. Use the --url option to output only the value of the
1263 </p>
1264 </dd>
1267 </dt>
1268 <dd>
1269 <p>
1270 Lists the properties stored in the Subversion repository about a
1271 given file or directory. Use -r/--revision to refer to a specific
1272 Subversion revision.
1273 </p>
1274 </dd>
1277 </dt>
1278 <dd>
1279 <p>
1280 Gets the Subversion property given as the first argument, for a
1281 file. A specific revision can be specified with -r/--revision.
1282 </p>
1283 </dd>
1286 </dt>
1287 <dd>
1288 <p>
1289 Shows the Subversion externals. Use -r/--revision to specify a
1290 specific revision.
1291 </p>
1292 </dd>
1295 </dt>
1296 <dd>
1297 <p>
1300 </p>
1301 </dd>
1304 </dt>
1305 <dd>
1306 <p>
1310 should not be necessary. However, if SVN permissions change,
1312 with "not found in commit" (file not previously visible) or
1313 "checksum mismatch" (missed a modification). If the problem
1314 file cannot be ignored forever (with --ignore-paths) the only
1316 </p>
1317 <div class="paragraph"><p>Only the rev_map and refs/remotes/git-svn are changed. Follow <em>reset</em>
1319 branches onto the new tree.</p></div>
1323 </dt>
1326 </dt>
1327 <dd>
1328 <p>
1329 Specify the most recent revision to keep. All later revisions
1330 are discarded.
1331 </p>
1332 </dd>
1334 -p
1335 </dt>
1337 --parent
1338 </dt>
1339 <dd>
1340 <p>
1341 Discard the specified revision as well, keeping the nearest
1342 parent instead.
1343 </p>
1344 </dd>
1346 Example:
1347 </dt>
1348 <dd>
1349 <p>
1351 </p>
1354 <pre><tt> r1---r2---r3 remotes/git-svn
1355 \
1356 A---B master</tt></pre>
1357 </div></div>
1359 be incomplete in the first place. Then:</p></div>
1362 git svn fetch</div>
1364 </div></div>
1367 <pre><tt> r1---r2'--r3' remotes/git-svn
1368 \
1369 r2---r3---A---B master</tt></pre>
1370 </div></div>
1377 </div></div>
1380 <pre><tt> r1---r2'--r3' remotes/git-svn
1381 \
1382 A'--B' master</tt></pre>
1383 </div></div>
1384 </dd>
1385 </dl></div>
1386 </dd>
1387 </dl></div>
1388 </div>
1393 --shared[=(false|true|umask|group|all|world|everybody)]
1394 </dt>
1397 </dt>
1398 <dd>
1399 <p>
1402 </p>
1403 </dd>
1406 </dt>
1409 </dt>
1410 <dd>
1411 <p>
1413 </p>
1415 to be supported. $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges),
1416 $NUMBER:HEAD, and BASE:$NUMBER are all supported.</p></div>
1418 but is generally not recommended because history will be skipped
1419 and lost.</p></div>
1420 </dd>
1422 -
1423 </dt>
1425 --stdin
1426 </dt>
1427 <dd>
1428 <p>
1430 </p>
1432 order. Only the leading sha1 is read from each line, so
1434 </dd>
1436 --rmdir
1437 </dt>
1438 <dd>
1439 <p>
1441 </p>
1443 behind. SVN can version empty directories, and they are not
1444 removed by default if there are no files left in them. git
1445 cannot version empty directories. Enabling this flag will make
1446 the commit to SVN act like git.</p></div>
1450 </div></div>
1451 </dd>
1453 -e
1454 </dt>
1456 --edit
1457 </dt>
1458 <dd>
1459 <p>
1461 </p>
1463 default for objects that are commits, and forced on when committing
1464 tree objects.</p></div>
1468 </div></div>
1469 </dd>
1472 </dt>
1474 --find-copies-harder
1475 </dt>
1476 <dd>
1477 <p>
1479 </p>
1484 config key: svn.findcopiesharder</div>
1486 </div></div>
1487 </dd>
1490 </dt>
1493 </dt>
1494 <dd>
1495 <p>
1497 </p>
1501 </div></div>
1504 will abort operation. The user will then have to add the
1506 after the authors-file is modified should continue operation.</p></div>
1510 </div></div>
1511 </dd>
1514 </dt>
1515 <dd>
1516 <p>
1517 If this option is specified, for each SVN committer name that
1518 does not exist in the authors file, the given file is executed
1519 with the committer name as the first argument. The program is
1520 expected to return a single line of the form "Name <email>",
1521 which will be treated as if included in the authors file.
1522 </p>
1523 </dd>
1525 -q
1526 </dt>
1528 --quiet
1529 </dt>
1530 <dd>
1531 <p>
1533 even less verbose.
1534 </p>
1535 </dd>
1538 </dt>
1541 </dt>
1542 <dd>
1543 <p>
1544 These should help keep disk usage sane for large fetches with
1545 many revisions.
1546 </p>
1548 to fetch before repacking. This defaults to repacking every
1553 config key: svn.repackflags</div>
1555 </div></div>
1556 </dd>
1558 -m
1559 </dt>
1561 --merge
1562 </dt>
1565 </dt>
1568 </dt>
1569 <dd>
1570 <p>
1572 </p>
1573 <div class="paragraph"><p>Passed directly to <em>git rebase</em> when using <em>dcommit</em> if a
1575 </dd>
1577 -n
1578 </dt>
1580 --dry-run
1581 </dt>
1582 <dd>
1583 <p>
1586 </p>
1587 <div class="paragraph"><p>For <em>dcommit</em>, print out the series of git arguments that would show
1588 which diffs would be committed to SVN.</p></div>
1589 <div class="paragraph"><p>For <em>rebase</em>, display the local branch associated with the upstream svn
1590 repository associated with the current branch and the URL of svn
1591 repository that will be fetched from.</p></div>
1592 <div class="paragraph"><p>For <em>branch</em> and <em>tag</em>, display the urls that will be used for copying when
1593 creating the branch or tag.</p></div>
1594 </dd>
1596 --use-log-author
1597 </dt>
1598 <dd>
1599 <p>
1601 <em>dcommit</em> operations), look for the first <tt>From:</tt> or <tt>Signed-off-by:</tt> line
1602 in the log message and use that as the author string.
1603 </p>
1604 </dd>
1606 --add-author-from
1607 </dt>
1608 <dd>
1609 <p>
1610 When committing to svn from git (as part of <em>commit-diff</em>, <em>set-tree</em> or <em>dcommit</em>
1611 operations), if the existing log message doesn’t already have a
1614 will retrieve a valid author string for all commits.
1615 </p>
1616 </dd>
1617 </dl></div>
1618 </div>
1624 </dt>
1627 </dt>
1628 <dd>
1629 <p>
1630 This sets GIT_SVN_ID (instead of using the environment). This
1631 allows the user to override the default refname to fetch from
1633 no longer require this switch as an argument.
1634 </p>
1635 </dd>
1638 </dt>
1641 </dt>
1642 <dd>
1643 <p>
1644 Specify the [svn-remote "<remote name>"] section to use,
1645 this allows SVN multiple repositories to be tracked.
1646 Default: "svn"
1647 </p>
1648 </dd>
1650 --follow-parent
1651 </dt>
1652 <dd>
1653 <p>
1654 This is especially helpful when we’re tracking a directory
1655 that has been moved around within the repository, or if we
1656 started tracking a branch and never tracked the trunk it was
1657 descended from. This feature is enabled by default, use
1658 --no-follow-parent to disable it.
1659 </p>
1663 </div></div>
1664 </dd>
1665 </dl></div>
1666 </div>
1671 svn.noMetadata
1672 </dt>
1675 </dt>
1676 <dd>
1677 <p>
1679 </p>
1680 <div class="paragraph"><p>This option can only be used for one-shot imports as <em>git svn</em>
1681 will not be able to fetch again without metadata. Additionally,
1683 be able to rebuild them.</p></div>
1686 option for (hopefully) obvious reasons.</p></div>
1687 <div class="paragraph"><p>This option is NOT recommended as it makes it difficult to track down
1688 old references to SVN revision numbers in existing documentation, bug
1689 reports and archives. If you plan to eventually migrate from SVN to git
1690 and are certain about dropping SVN history, consider
1692 reformatting of metadata for ease-of-reading and rewriting authorship
1694 </dd>
1696 svn.useSvmProps
1697 </dt>
1700 </dt>
1701 <dd>
1702 <p>
1704 mirrors created using SVN::Mirror (or svk) for metadata.
1705 </p>
1707 that the revision was created by SVN::Mirror (also used by SVK).
1708 The property contains a repository UUID and a revision. We want
1709 to make it look like we are mirroring the original URL, so
1710 introduce a helper function that returns the original identity
1711 URL and UUID, and use it when generating metadata in commit
1712 messages.</p></div>
1713 </dd>
1715 svn.useSvnsyncProps
1716 </dt>
1719 </dt>
1720 <dd>
1721 <p>
1722 Similar to the useSvmProps option; this is for users
1724 later.
1725 </p>
1726 </dd>
1729 </dt>
1730 <dd>
1731 <p>
1732 This allows users to create repositories from alternate
1734 server locally (accessing via file://) but wish to distribute
1735 the repository with a public http:// or svn:// URL in the
1736 metadata so users of it will see the public URL.
1737 </p>
1738 </dd>
1741 </dt>
1742 <dd>
1743 <p>
1744 Similar to the useSvmProps option; this is for users who need
1745 to remap the UUID manually. This may be useful in situations
1746 where the original UUID is not available via either useSvmProps
1747 or useSvnsyncProps.
1748 </p>
1749 </dd>
1752 </dt>
1753 <dd>
1754 <p>
1757 via a read-only transport, to provide an alternate read/write
1758 transport. It is assumed that both keys point to the same
1761 takes precedence.
1762 </p>
1763 </dd>
1765 svn.brokenSymlinkWorkaround
1766 </dt>
1767 <dd>
1768 <p>
1769 This disables potentially expensive checks to workaround
1770 broken symlinks checked into SVN by broken clients. Set this
1771 option to "false" if you track a SVN repository with many
1772 empty blobs that are not symlinks. This option may be changed
1775 be "true".
1776 </p>
1777 </dd>
1779 svn.pathnameencoding
1780 </dt>
1781 <dd>
1782 <p>
1783 This instructs git svn to recode pathnames to a given encoding.
1784 It can be used by windows users and by those who work in non-utf8
1785 locales to avoid corrupted file names with non-ASCII characters.
1786 Valid encodings are the ones supported by Perl’s Encode module.
1787 </p>
1788 </dd>
1791 </dt>
1792 <dd>
1793 <p>
1795 attempt to recreate empty directories that are in the
1796 Subversion repository. If this option is set to "false", then
1797 empty directories will only be created if the "git svn mkdirs"
1799 option to be "true".
1800 </p>
1801 </dd>
1802 </dl></div>
1803 <div class="paragraph"><p>Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps
1806 and these settings should never be changed once they are set.</p></div>
1809 for rewriteRoot and rewriteUUID which can be used together.</p></div>
1810 </div>
1813 <div class="paragraph"><p>Tracking and contributing to the trunk of a Subversion-managed project:</p></div>
1816 <pre><tt># Clone a repo (like git clone):
1817 git svn clone http://svn.example.com/project/trunk
1818 # Enter the newly cloned directory:
1819 cd trunk
1820 # You should be on master branch, double-check with 'git branch'
1821 git branch
1822 # Do some work and commit locally to git:
1823 git commit ...
1824 # Something is committed to SVN, rebase your local changes against the
1825 # latest changes in SVN:
1826 git svn rebase
1827 # Now commit your changes (that were committed previously using git) to SVN,
1828 # as well as automatically updating your working HEAD:
1829 git svn dcommit
1830 # Append svn:ignore settings to the default git exclude file:
1832 </div></div>
1834 (complete with a trunk, tags and branches):</p></div>
1837 <pre><tt># Clone a repo (like git clone):
1838 git svn clone http://svn.example.com/project -T trunk -b branches -t tags
1839 # View all branches and tags you have cloned:
1840 git branch -r
1841 # Create a new branch in SVN
1842 git svn branch waldo
1843 # Reset your master to trunk (or any other branch, replacing 'trunk'
1844 # with the appropriate name):
1845 git reset --hard remotes/trunk
1846 # You may only dcommit to one branch/tag/trunk at a time. The usage
1847 # of dcommit/rebase/show-ignore should be the same as above.</tt></pre>
1848 </div></div>
1850 (especially for large Subversion repositories). If multiple
1851 people (or one person with multiple machines) want to use
1857 <pre><tt># Do the initial import on a server
1858 ssh server "cd /pub && git svn clone http://svn.example.com/project
1859 # Clone locally - make sure the refs/remotes/ space matches the server
1860 mkdir project
1861 cd project
1862 git init
1863 git remote add origin server:/pub/project
1864 git config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
1865 git fetch
1866 # Prevent fetch/pull from remote git server in the future,
1867 # we only want to use git svn for future updates
1868 git config --remove-section remote.origin
1869 # Create a local branch from one of the branches just fetched
1870 git checkout -b master FETCH_HEAD
1871 # Initialize 'git svn' locally (be sure to use the same URL and -T/-b/-t options as were used on server)
1872 git svn init http://svn.example.com/project
1873 # Pull the latest changes from Subversion
1874 git svn rebase</tt></pre>
1875 </div></div>
1876 </div>
1879 <div class="paragraph"><p>Originally, <em>git svn</em> recommended that the <em>remotes/git-svn</em> branch be
1880 pulled or merged from. This is because the author favored
1881 <tt>git svn set-tree B</tt> to commit a single head rather than the
1882 <tt>git svn set-tree A..B</tt> notation to commit multiple commits.</p></div>
1883 <div class="paragraph"><p>If you use <tt>git svn set-tree A..B</tt> to commit several diffs and you do
1884 not have the latest remotes/git-svn merged into my-branch, you should
1885 use <tt>git svn rebase</tt> to update your work branch instead of <tt>git pull</tt> or
1886 <tt>git merge</tt>. <tt>pull</tt>/<tt>merge</tt> can cause non-linear history to be flattened
1887 when committing into SVN, which can lead to merge commits reversing
1888 previous commits in SVN.</p></div>
1889 </div>
1893 copy history (including branches and tags) for repositories adopting a
1894 standard layout, it cannot yet represent merge history that happened
1895 inside git back upstream to SVN users. Therefore it is advised that
1896 users keep history as linear as possible inside git to ease
1897 compatibility with SVN (see the CAVEATS section below).</p></div>
1898 </div>
1902 it is recommended that all <em>git svn</em> users clone, fetch and dcommit
1903 directly from the SVN server, and avoid all <em>git clone</em>/<em>pull</em>/<em>merge</em>/<em>push</em>
1904 operations between git repositories and branches. The recommended
1905 method of exchanging code between git branches and users is
1906 <em>git format-patch</em> and <em>git am</em>, or just 'dcommit’ing to the SVN repository.</p></div>
1907 <div class="paragraph"><p>Running <em>git merge</em> or <em>git pull</em> is NOT recommended on a branch you
1908 plan to <em>dcommit</em> from because Subversion users cannot see any
1909 merges you’ve made. Furthermore, if you merge or pull from a git branch
1910 that is a mirror of an SVN branch, <em>dcommit</em> may commit to the wrong
1911 branch.</p></div>
1912 <div class="paragraph"><p>If you do merge, note the following rule: <em>git svn dcommit</em> will
1913 attempt to commit on top of the SVN commit named in</p></div>
1916 <pre><tt>git log --grep=^git-svn-id: --first-parent -1</tt></pre>
1917 </div></div>
1918 <div class="paragraph"><p>You <em>must</em> therefore ensure that the most recent commit of the branch
1919 you want to dcommit to is the <em>first</em> parent of the merge. Chaos will
1920 ensue otherwise, especially if the first parent is an older commit on
1921 the same SVN branch.</p></div>
1922 <div class="paragraph"><p><em>git clone</em> does not clone branches under the refs/remotes/ hierarchy or
1923 any <em>git svn</em> metadata, or config. So repositories created and managed with
1924 using <em>git svn</em> should use <em>rsync</em> for cloning, if cloning is to be done
1925 at all.</p></div>
1926 <div class="paragraph"><p>Since <em>dcommit</em> uses rebase internally, any git branches you <em>git push</em> to
1927 before <em>dcommit</em> on will require forcing an overwrite of the existing ref
1928 on the remote repository. This is generally considered bad practice,
1930 <div class="paragraph"><p>Do not use the --amend option of <a href="git-commit.html">git-commit(1)</a> on a change you’ve
1931 already dcommitted. It is considered bad practice to --amend commits
1932 you’ve already pushed to a remote repository for other users, and
1933 dcommit with SVN is analogous to that.</p></div>
1934 <div class="paragraph"><p>When using multiple --branches or --tags, <em>git svn</em> does not automatically
1935 handle name collisions (for example, if two branches from different paths have
1936 the same name, or if a branch and a tag have the same name). In these cases,
1937 use <em>init</em> to set up your git repository then, before your first <em>fetch</em>, edit
1938 the .git/config file so that the branches and tags are associated with
1939 different name spaces. For example:</p></div>
1942 <pre><tt>branches = stable/*:refs/remotes/svn/stable/*
1943 branches = debug/*:refs/remotes/svn/debug/*</tt></pre>
1944 </div></div>
1945 </div>
1949 properties are logged to $GIT_DIR/svn/<refname>/unhandled.log</p></div>
1951 tracked when committing to SVN. I do not plan on adding support for
1952 this as it’s quite difficult and time-consuming to get working for all
1953 the possible corner cases (git doesn’t do it, either). Committing
1954 renamed and copied files is fully supported if they’re similar enough
1955 for git to detect them.</p></div>
1956 </div>
1959 <div class="paragraph"><p><em>git svn</em> stores [svn-remote] configuration information in the
1960 repository .git/config file. It is similar the core git
1961 [remote] sections except <em>fetch</em> keys do not accept glob
1962 arguments; but they are instead handled by the <em>branches</em>
1963 and <em>tags</em> keys. Since some SVN repositories are oddly
1964 configured with multiple projects glob expansions such those
1965 listed below are allowed:</p></div>
1969 url = http://server.org/svn
1970 fetch = trunk/project-a:refs/remotes/project-a/trunk
1971 branches = branches/*/project-a:refs/remotes/project-a/branches/*
1972 tags = tags/*/project-a:refs/remotes/project-a/tags/*</tt></pre>
1973 </div></div>
1974 <div class="paragraph"><p>Keep in mind that the <em>*</em> (asterisk) wildcard of the local ref
1975 (right of the <em>:</em>) <strong>must</strong> be the farthest right path component;
1976 however the remote wildcard may be anywhere as long as it’s an
1977 independent path component (surrounded by <em>/</em> or EOL). This
1978 type of configuration is not automatically created by <em>init</em> and
1979 should be manually entered with a text-editor or using <em>git config</em>.</p></div>
1981 comma-separated list of names within braces. For example:</p></div>
1985 url = http://server.org/svn
1986 fetch = trunk/src:refs/remotes/trunk
1987 branches = branches/{red,green}/src:refs/remotes/branches/*
1988 tags = tags/{1.0,2.0}/src:refs/remotes/tags/*</tt></pre>
1989 </div></div>
1990 <div class="paragraph"><p>Note that git-svn keeps track of the highest revision in which a branch
1991 or tag has appeared. If the subset of branches or tags is changed after
1992 fetching, then .git/svn/.metadata must be manually edited to remove (or
1993 reset) branches-maxRev and/or tags-maxRev as appropriate.</p></div>
1994 </div>
1998 </div>
2002 </div>
2003 </div>
2007 Last updated 2011-10-16 13:41:53 PDT
2008 </div>
2009 </div>
2010 </body>
2011 </html>