| blob | 4cb01eb5cecf7a8d391a74742643b23ce84efdec |
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>
967 </dl></div>
968 </dd>
971 </dt>
972 <dd>
973 <p>
974 Create a branch in the SVN repository.
975 </p>
978 -m
979 </dt>
981 --message
982 </dt>
983 <dd>
984 <p>
985 Allows to specify the commit message.
986 </p>
987 </dd>
989 -t
990 </dt>
992 --tag
993 </dt>
994 <dd>
995 <p>
996 Create a tag by using the tags_subdir instead of the branches_subdir
997 specified during git svn init.
998 </p>
999 </dd>
1001 -d
1002 </dt>
1004 --destination
1005 </dt>
1006 <dd>
1007 <p>
1010 tag) you wish to create in the SVN repository. The value of this
1011 option must match one of the paths specified by a --branches (or
1012 --tags) option. You can see these paths with the commands
1013 </p>
1018 </div></div>
1019 <div class="paragraph"><p>where <name> is the name of the SVN repository as specified by the -R option to
1021 </dd>
1023 --username
1024 </dt>
1025 <dd>
1026 <p>
1027 Specify the SVN username to perform the commit as. This option overrides
1029 </p>
1030 </dd>
1032 --commit-url
1033 </dt>
1034 <dd>
1035 <p>
1036 Use the specified URL to connect to the destination Subversion
1037 repository. This is useful in cases where the source SVN
1038 repository is read-only. This option overrides configuration
1040 </p>
1044 </div></div>
1045 </dd>
1046 </dl></div>
1047 </dd>
1050 </dt>
1051 <dd>
1052 <p>
1053 Create a tag in the SVN repository. This is a shorthand for
1055 </p>
1056 </dd>
1059 </dt>
1060 <dd>
1061 <p>
1062 This should make it easy to look up svn log messages when svn
1063 users refer to -r/--revision numbers.
1064 </p>
1065 <div class="paragraph"><p>The following features from ‘svn log’ are supported:</p></div>
1069 </dt>
1072 </dt>
1073 <dd>
1074 <p>
1075 is supported, non-numeric args are not:
1076 HEAD, NEXT, BASE, PREV, etc …
1077 </p>
1078 </dd>
1080 -v
1081 </dt>
1083 --verbose
1084 </dt>
1085 <dd>
1086 <p>
1087 it’s not completely compatible with the --verbose
1088 output in svn log, but reasonably close.
1089 </p>
1090 </dd>
1093 </dt>
1094 <dd>
1095 <p>
1096 is NOT the same as --max-count, doesn’t count
1097 merged/excluded commits
1098 </p>
1099 </dd>
1101 --incremental
1102 </dt>
1103 <dd>
1104 <p>
1105 supported
1106 </p>
1107 </dd>
1108 </dl></div>
1112 --show-commit
1113 </dt>
1114 <dd>
1115 <p>
1116 shows the git commit sha1, as well
1117 </p>
1118 </dd>
1120 --oneline
1121 </dt>
1122 <dd>
1123 <p>
1124 our version of --pretty=oneline
1125 </p>
1126 </dd>
1127 </dl></div>
1129 <table><tr>
1132 </td>
1134 client converts the UTC time to the local time (or based on the TZ=
1135 environment). This command has the same behaviour.</td>
1136 </tr></table>
1137 </div>
1138 <div class="paragraph"><p>Any other arguments are passed directly to <em>git log</em></p></div>
1139 </dd>
1142 </dt>
1143 <dd>
1144 <p>
1145 Show what revision and author last modified each line of a file. The
1146 output of this mode is format-compatible with the output of
1148 local uncommitted changes in the working tree are ignored;
1149 the version of the file in the HEAD revision is annotated. Unknown
1151 </p>
1154 --git-format
1155 </dt>
1156 <dd>
1157 <p>
1159 SVN revision numbers instead of git commit hashes. In this mode,
1160 changes that haven’t been committed to SVN (including local
1161 working-copy edits) are shown as revision 0.
1162 </p>
1163 </dd>
1164 </dl></div>
1165 </dd>
1168 </dt>
1169 <dd>
1170 <p>
1172 corresponding git commit hash (this can optionally be followed by a
1173 tree-ish to specify which branch should be searched). When given a
1174 tree-ish, returns the corresponding SVN revision number.
1175 </p>
1176 </dd>
1179 </dt>
1180 <dd>
1181 <p>
1183 Commit specified commit or tree objects to SVN. This relies on
1184 your imported fetch data being up-to-date. This makes
1185 absolutely no attempts to do patching when committing to SVN, it
1186 simply overwrites files with those specified in the tree or
1187 commit. All merging is assumed to have taken place
1189 </p>
1190 </dd>
1193 </dt>
1194 <dd>
1195 <p>
1196 Recursively finds the svn:ignore property on directories and
1197 creates matching .gitignore files. The resulting files are staged to
1198 be committed, but are not committed. Use -r/--revision to refer to a
1199 specific revision.
1200 </p>
1201 </dd>
1204 </dt>
1205 <dd>
1206 <p>
1207 Recursively finds and lists the svn:ignore property on
1208 directories. The output is suitable for appending to
1209 the $GIT_DIR/info/exclude file.
1210 </p>
1211 </dd>
1214 </dt>
1215 <dd>
1216 <p>
1217 Attempts to recreate empty directories that core git cannot track
1219 Empty directories are automatically recreated when using
1223 more information.)
1224 </p>
1225 </dd>
1228 </dt>
1229 <dd>
1230 <p>
1231 Commits the diff of two tree-ish arguments from the
1232 command-line. This command does not rely on being inside an <tt>git svn
1233 init</tt>-ed repository. This command takes three arguments, (a) the
1234 original tree to diff against, (b) the new tree result, (c) the
1235 URL of the target Subversion repository. The final argument
1239 </p>
1240 </dd>
1243 </dt>
1244 <dd>
1245 <p>
1246 Shows information about a file or directory similar to what
1248 argument. Use the --url option to output only the value of the
1250 </p>
1251 </dd>
1254 </dt>
1255 <dd>
1256 <p>
1257 Lists the properties stored in the Subversion repository about a
1258 given file or directory. Use -r/--revision to refer to a specific
1259 Subversion revision.
1260 </p>
1261 </dd>
1264 </dt>
1265 <dd>
1266 <p>
1267 Gets the Subversion property given as the first argument, for a
1268 file. A specific revision can be specified with -r/--revision.
1269 </p>
1270 </dd>
1273 </dt>
1274 <dd>
1275 <p>
1276 Shows the Subversion externals. Use -r/--revision to specify a
1277 specific revision.
1278 </p>
1279 </dd>
1282 </dt>
1283 <dd>
1284 <p>
1287 </p>
1288 </dd>
1291 </dt>
1292 <dd>
1293 <p>
1297 should not be necessary. However, if SVN permissions change,
1299 with "not found in commit" (file not previously visible) or
1300 "checksum mismatch" (missed a modification). If the problem
1301 file cannot be ignored forever (with --ignore-paths) the only
1303 </p>
1304 <div class="paragraph"><p>Only the rev_map and refs/remotes/git-svn are changed. Follow <em>reset</em>
1306 branches onto the new tree.</p></div>
1310 </dt>
1313 </dt>
1314 <dd>
1315 <p>
1316 Specify the most recent revision to keep. All later revisions
1317 are discarded.
1318 </p>
1319 </dd>
1321 -p
1322 </dt>
1324 --parent
1325 </dt>
1326 <dd>
1327 <p>
1328 Discard the specified revision as well, keeping the nearest
1329 parent instead.
1330 </p>
1331 </dd>
1333 Example:
1334 </dt>
1335 <dd>
1336 <p>
1338 </p>
1341 <pre><tt> r1---r2---r3 remotes/git-svn
1342 \
1343 A---B master</tt></pre>
1344 </div></div>
1346 be incomplete in the first place. Then:</p></div>
1349 git svn fetch</div>
1351 </div></div>
1354 <pre><tt> r1---r2'--r3' remotes/git-svn
1355 \
1356 r2---r3---A---B master</tt></pre>
1357 </div></div>
1364 </div></div>
1367 <pre><tt> r1---r2'--r3' remotes/git-svn
1368 \
1369 A'--B' master</tt></pre>
1370 </div></div>
1371 </dd>
1372 </dl></div>
1373 </dd>
1374 </dl></div>
1375 </div>
1380 --shared[=(false|true|umask|group|all|world|everybody)]
1381 </dt>
1384 </dt>
1385 <dd>
1386 <p>
1389 </p>
1390 </dd>
1393 </dt>
1396 </dt>
1397 <dd>
1398 <p>
1400 </p>
1402 to be supported. $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges),
1403 $NUMBER:HEAD, and BASE:$NUMBER are all supported.</p></div>
1405 but is generally not recommended because history will be skipped
1406 and lost.</p></div>
1407 </dd>
1409 -
1410 </dt>
1412 --stdin
1413 </dt>
1414 <dd>
1415 <p>
1417 </p>
1419 order. Only the leading sha1 is read from each line, so
1421 </dd>
1423 --rmdir
1424 </dt>
1425 <dd>
1426 <p>
1428 </p>
1430 behind. SVN can version empty directories, and they are not
1431 removed by default if there are no files left in them. git
1432 cannot version empty directories. Enabling this flag will make
1433 the commit to SVN act like git.</p></div>
1437 </div></div>
1438 </dd>
1440 -e
1441 </dt>
1443 --edit
1444 </dt>
1445 <dd>
1446 <p>
1448 </p>
1450 default for objects that are commits, and forced on when committing
1451 tree objects.</p></div>
1455 </div></div>
1456 </dd>
1459 </dt>
1461 --find-copies-harder
1462 </dt>
1463 <dd>
1464 <p>
1466 </p>
1471 config key: svn.findcopiesharder</div>
1473 </div></div>
1474 </dd>
1477 </dt>
1480 </dt>
1481 <dd>
1482 <p>
1484 </p>
1488 </div></div>
1491 will abort operation. The user will then have to add the
1493 after the authors-file is modified should continue operation.</p></div>
1497 </div></div>
1498 </dd>
1501 </dt>
1502 <dd>
1503 <p>
1504 If this option is specified, for each SVN committer name that
1505 does not exist in the authors file, the given file is executed
1506 with the committer name as the first argument. The program is
1507 expected to return a single line of the form "Name <email>",
1508 which will be treated as if included in the authors file.
1509 </p>
1510 </dd>
1512 -q
1513 </dt>
1515 --quiet
1516 </dt>
1517 <dd>
1518 <p>
1520 even less verbose.
1521 </p>
1522 </dd>
1525 </dt>
1528 </dt>
1529 <dd>
1530 <p>
1531 These should help keep disk usage sane for large fetches with
1532 many revisions.
1533 </p>
1535 to fetch before repacking. This defaults to repacking every
1540 config key: svn.repackflags</div>
1542 </div></div>
1543 </dd>
1545 -m
1546 </dt>
1548 --merge
1549 </dt>
1552 </dt>
1555 </dt>
1556 <dd>
1557 <p>
1559 </p>
1560 <div class="paragraph"><p>Passed directly to <em>git rebase</em> when using <em>dcommit</em> if a
1562 </dd>
1564 -n
1565 </dt>
1567 --dry-run
1568 </dt>
1569 <dd>
1570 <p>
1573 </p>
1574 <div class="paragraph"><p>For <em>dcommit</em>, print out the series of git arguments that would show
1575 which diffs would be committed to SVN.</p></div>
1576 <div class="paragraph"><p>For <em>rebase</em>, display the local branch associated with the upstream svn
1577 repository associated with the current branch and the URL of svn
1578 repository that will be fetched from.</p></div>
1579 <div class="paragraph"><p>For <em>branch</em> and <em>tag</em>, display the urls that will be used for copying when
1580 creating the branch or tag.</p></div>
1581 </dd>
1583 --use-log-author
1584 </dt>
1585 <dd>
1586 <p>
1588 <em>dcommit</em> operations), look for the first <tt>From:</tt> or <tt>Signed-off-by:</tt> line
1589 in the log message and use that as the author string.
1590 </p>
1591 </dd>
1593 --add-author-from
1594 </dt>
1595 <dd>
1596 <p>
1597 When committing to svn from git (as part of <em>commit-diff</em>, <em>set-tree</em> or <em>dcommit</em>
1598 operations), if the existing log message doesn’t already have a
1601 will retrieve a valid author string for all commits.
1602 </p>
1603 </dd>
1604 </dl></div>
1605 </div>
1611 </dt>
1614 </dt>
1615 <dd>
1616 <p>
1617 This sets GIT_SVN_ID (instead of using the environment). This
1618 allows the user to override the default refname to fetch from
1620 no longer require this switch as an argument.
1621 </p>
1622 </dd>
1625 </dt>
1628 </dt>
1629 <dd>
1630 <p>
1631 Specify the [svn-remote "<remote name>"] section to use,
1632 this allows SVN multiple repositories to be tracked.
1633 Default: "svn"
1634 </p>
1635 </dd>
1637 --follow-parent
1638 </dt>
1639 <dd>
1640 <p>
1641 This is especially helpful when we’re tracking a directory
1642 that has been moved around within the repository, or if we
1643 started tracking a branch and never tracked the trunk it was
1644 descended from. This feature is enabled by default, use
1645 --no-follow-parent to disable it.
1646 </p>
1650 </div></div>
1651 </dd>
1652 </dl></div>
1653 </div>
1658 svn.noMetadata
1659 </dt>
1662 </dt>
1663 <dd>
1664 <p>
1666 </p>
1667 <div class="paragraph"><p>This option can only be used for one-shot imports as <em>git svn</em>
1668 will not be able to fetch again without metadata. Additionally,
1670 be able to rebuild them.</p></div>
1673 option for (hopefully) obvious reasons.</p></div>
1674 <div class="paragraph"><p>This option is NOT recommended as it makes it difficult to track down
1675 old references to SVN revision numbers in existing documentation, bug
1676 reports and archives. If you plan to eventually migrate from SVN to git
1677 and are certain about dropping SVN history, consider
1679 reformatting of metadata for ease-of-reading and rewriting authorship
1681 </dd>
1683 svn.useSvmProps
1684 </dt>
1687 </dt>
1688 <dd>
1689 <p>
1691 mirrors created using SVN::Mirror (or svk) for metadata.
1692 </p>
1694 that the revision was created by SVN::Mirror (also used by SVK).
1695 The property contains a repository UUID and a revision. We want
1696 to make it look like we are mirroring the original URL, so
1697 introduce a helper function that returns the original identity
1698 URL and UUID, and use it when generating metadata in commit
1699 messages.</p></div>
1700 </dd>
1702 svn.useSvnsyncProps
1703 </dt>
1706 </dt>
1707 <dd>
1708 <p>
1709 Similar to the useSvmProps option; this is for users
1711 later.
1712 </p>
1713 </dd>
1716 </dt>
1717 <dd>
1718 <p>
1719 This allows users to create repositories from alternate
1721 server locally (accessing via file://) but wish to distribute
1722 the repository with a public http:// or svn:// URL in the
1723 metadata so users of it will see the public URL.
1724 </p>
1725 </dd>
1728 </dt>
1729 <dd>
1730 <p>
1731 Similar to the useSvmProps option; this is for users who need
1732 to remap the UUID manually. This may be useful in situations
1733 where the original UUID is not available via either useSvmProps
1734 or useSvnsyncProps.
1735 </p>
1736 </dd>
1739 </dt>
1740 <dd>
1741 <p>
1744 via a read-only transport, to provide an alternate read/write
1745 transport. It is assumed that both keys point to the same
1748 takes precedence.
1749 </p>
1750 </dd>
1752 svn.brokenSymlinkWorkaround
1753 </dt>
1754 <dd>
1755 <p>
1756 This disables potentially expensive checks to workaround
1757 broken symlinks checked into SVN by broken clients. Set this
1758 option to "false" if you track a SVN repository with many
1759 empty blobs that are not symlinks. This option may be changed
1762 be "true".
1763 </p>
1764 </dd>
1766 svn.pathnameencoding
1767 </dt>
1768 <dd>
1769 <p>
1770 This instructs git svn to recode pathnames to a given encoding.
1771 It can be used by windows users and by those who work in non-utf8
1772 locales to avoid corrupted file names with non-ASCII characters.
1773 Valid encodings are the ones supported by Perl’s Encode module.
1774 </p>
1775 </dd>
1778 </dt>
1779 <dd>
1780 <p>
1782 attempt to recreate empty directories that are in the
1783 Subversion repository. If this option is set to "false", then
1784 empty directories will only be created if the "git svn mkdirs"
1786 option to be "true".
1787 </p>
1788 </dd>
1789 </dl></div>
1790 <div class="paragraph"><p>Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps
1793 and these settings should never be changed once they are set.</p></div>
1796 for rewriteRoot and rewriteUUID which can be used together.</p></div>
1797 </div>
1800 <div class="paragraph"><p>Tracking and contributing to the trunk of a Subversion-managed project:</p></div>
1803 <pre><tt># Clone a repo (like git clone):
1804 git svn clone http://svn.example.com/project/trunk
1805 # Enter the newly cloned directory:
1806 cd trunk
1807 # You should be on master branch, double-check with 'git branch'
1808 git branch
1809 # Do some work and commit locally to git:
1810 git commit ...
1811 # Something is committed to SVN, rebase your local changes against the
1812 # latest changes in SVN:
1813 git svn rebase
1814 # Now commit your changes (that were committed previously using git) to SVN,
1815 # as well as automatically updating your working HEAD:
1816 git svn dcommit
1817 # Append svn:ignore settings to the default git exclude file:
1819 </div></div>
1821 (complete with a trunk, tags and branches):</p></div>
1824 <pre><tt># Clone a repo (like git clone):
1825 git svn clone http://svn.example.com/project -T trunk -b branches -t tags
1826 # View all branches and tags you have cloned:
1827 git branch -r
1828 # Create a new branch in SVN
1829 git svn branch waldo
1830 # Reset your master to trunk (or any other branch, replacing 'trunk'
1831 # with the appropriate name):
1832 git reset --hard remotes/trunk
1833 # You may only dcommit to one branch/tag/trunk at a time. The usage
1834 # of dcommit/rebase/show-ignore should be the same as above.</tt></pre>
1835 </div></div>
1837 (especially for large Subversion repositories). If multiple
1838 people (or one person with multiple machines) want to use
1844 <pre><tt># Do the initial import on a server
1845 ssh server "cd /pub && git svn clone http://svn.example.com/project
1846 # Clone locally - make sure the refs/remotes/ space matches the server
1847 mkdir project
1848 cd project
1849 git init
1850 git remote add origin server:/pub/project
1851 git config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
1852 git fetch
1853 # Prevent fetch/pull from remote git server in the future,
1854 # we only want to use git svn for future updates
1855 git config --remove-section remote.origin
1856 # Create a local branch from one of the branches just fetched
1857 git checkout -b master FETCH_HEAD
1858 # Initialize 'git svn' locally (be sure to use the same URL and -T/-b/-t options as were used on server)
1859 git svn init http://svn.example.com/project
1860 # Pull the latest changes from Subversion
1861 git svn rebase</tt></pre>
1862 </div></div>
1863 </div>
1866 <div class="paragraph"><p>Originally, <em>git svn</em> recommended that the <em>remotes/git-svn</em> branch be
1867 pulled or merged from. This is because the author favored
1868 <tt>git svn set-tree B</tt> to commit a single head rather than the
1869 <tt>git svn set-tree A..B</tt> notation to commit multiple commits.</p></div>
1870 <div class="paragraph"><p>If you use <tt>git svn set-tree A..B</tt> to commit several diffs and you do
1871 not have the latest remotes/git-svn merged into my-branch, you should
1872 use <tt>git svn rebase</tt> to update your work branch instead of <tt>git pull</tt> or
1873 <tt>git merge</tt>. <tt>pull</tt>/<tt>merge</tt> can cause non-linear history to be flattened
1874 when committing into SVN, which can lead to merge commits reversing
1875 previous commits in SVN.</p></div>
1876 </div>
1880 copy history (including branches and tags) for repositories adopting a
1881 standard layout, it cannot yet represent merge history that happened
1882 inside git back upstream to SVN users. Therefore it is advised that
1883 users keep history as linear as possible inside git to ease
1884 compatibility with SVN (see the CAVEATS section below).</p></div>
1885 </div>
1889 it is recommended that all <em>git svn</em> users clone, fetch and dcommit
1890 directly from the SVN server, and avoid all <em>git clone</em>/<em>pull</em>/<em>merge</em>/<em>push</em>
1891 operations between git repositories and branches. The recommended
1892 method of exchanging code between git branches and users is
1893 <em>git format-patch</em> and <em>git am</em>, or just 'dcommit’ing to the SVN repository.</p></div>
1894 <div class="paragraph"><p>Running <em>git merge</em> or <em>git pull</em> is NOT recommended on a branch you
1895 plan to <em>dcommit</em> from because Subversion users cannot see any
1896 merges you’ve made. Furthermore, if you merge or pull from a git branch
1897 that is a mirror of an SVN branch, <em>dcommit</em> may commit to the wrong
1898 branch.</p></div>
1899 <div class="paragraph"><p>If you do merge, note the following rule: <em>git svn dcommit</em> will
1900 attempt to commit on top of the SVN commit named in</p></div>
1903 <pre><tt>git log --grep=^git-svn-id: --first-parent -1</tt></pre>
1904 </div></div>
1905 <div class="paragraph"><p>You <em>must</em> therefore ensure that the most recent commit of the branch
1906 you want to dcommit to is the <em>first</em> parent of the merge. Chaos will
1907 ensue otherwise, especially if the first parent is an older commit on
1908 the same SVN branch.</p></div>
1909 <div class="paragraph"><p><em>git clone</em> does not clone branches under the refs/remotes/ hierarchy or
1910 any <em>git svn</em> metadata, or config. So repositories created and managed with
1911 using <em>git svn</em> should use <em>rsync</em> for cloning, if cloning is to be done
1912 at all.</p></div>
1913 <div class="paragraph"><p>Since <em>dcommit</em> uses rebase internally, any git branches you <em>git push</em> to
1914 before <em>dcommit</em> on will require forcing an overwrite of the existing ref
1915 on the remote repository. This is generally considered bad practice,
1917 <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
1918 already dcommitted. It is considered bad practice to --amend commits
1919 you’ve already pushed to a remote repository for other users, and
1920 dcommit with SVN is analogous to that.</p></div>
1921 <div class="paragraph"><p>When using multiple --branches or --tags, <em>git svn</em> does not automatically
1922 handle name collisions (for example, if two branches from different paths have
1923 the same name, or if a branch and a tag have the same name). In these cases,
1924 use <em>init</em> to set up your git repository then, before your first <em>fetch</em>, edit
1925 the .git/config file so that the branches and tags are associated with
1926 different name spaces. For example:</p></div>
1929 <pre><tt>branches = stable/*:refs/remotes/svn/stable/*
1930 branches = debug/*:refs/remotes/svn/debug/*</tt></pre>
1931 </div></div>
1932 </div>
1936 properties are logged to $GIT_DIR/svn/<refname>/unhandled.log</p></div>
1938 tracked when committing to SVN. I do not plan on adding support for
1939 this as it’s quite difficult and time-consuming to get working for all
1940 the possible corner cases (git doesn’t do it, either). Committing
1941 renamed and copied files is fully supported if they’re similar enough
1942 for git to detect them.</p></div>
1943 </div>
1946 <div class="paragraph"><p><em>git svn</em> stores [svn-remote] configuration information in the
1947 repository .git/config file. It is similar the core git
1948 [remote] sections except <em>fetch</em> keys do not accept glob
1949 arguments; but they are instead handled by the <em>branches</em>
1950 and <em>tags</em> keys. Since some SVN repositories are oddly
1951 configured with multiple projects glob expansions such those
1952 listed below are allowed:</p></div>
1956 url = http://server.org/svn
1957 fetch = trunk/project-a:refs/remotes/project-a/trunk
1958 branches = branches/*/project-a:refs/remotes/project-a/branches/*
1959 tags = tags/*/project-a:refs/remotes/project-a/tags/*</tt></pre>
1960 </div></div>
1961 <div class="paragraph"><p>Keep in mind that the <em>*</em> (asterisk) wildcard of the local ref
1962 (right of the <em>:</em>) <strong>must</strong> be the farthest right path component;
1963 however the remote wildcard may be anywhere as long as it’s an
1964 independent path component (surrounded by <em>/</em> or EOL). This
1965 type of configuration is not automatically created by <em>init</em> and
1966 should be manually entered with a text-editor or using <em>git config</em>.</p></div>
1968 comma-separated list of names within braces. For example:</p></div>
1972 url = http://server.org/svn
1973 fetch = trunk/src:refs/remotes/trunk
1974 branches = branches/{red,green}/src:refs/remotes/branches/*
1975 tags = tags/{1.0,2.0}/src:refs/remotes/tags/*</tt></pre>
1976 </div></div>
1977 <div class="paragraph"><p>Note that git-svn keeps track of the highest revision in which a branch
1978 or tag has appeared. If the subset of branches or tags is changed after
1979 fetching, then .git/svn/.metadata must be manually edited to remove (or
1980 reset) branches-maxRev and/or tags-maxRev as appropriate.</p></div>
1981 </div>
1985 </div>
1989 </div>
1990 </div>
1994 Last updated 2011-10-05 13:59:16 PDT
1995 </div>
1996 </div>
1997 </body>
1998 </html>