| blob | fd130b9670864ed7b20785b5f151c95f410c9495 |
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 }
127 }
131 }
133 /* Block element titles. */
141 }
144 }
148 }
151 }
154 }
160 }
166 }
171 }
175 }
180 }
183 }
187 }
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 }
200 }
204 }
209 }
215 dl {
218 }
219 dt {
224 }
227 }
231 }
234 }
237 }
240 }
243 }
246 }
253 }
257 }
258 thead {
261 }
262 tfoot {
264 }
267 }
270 }
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 }
278 }
282 }
288 }
291 }
294 }
300 }
303 }
307 }
311 }
315 }
317 div#toctitle {
324 }
329 }
333 }
337 }
341 }
342 /* Overrides for manpage documents */
343 h1 {
348 }
349 h2 {
351 }
354 }
358 }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
366 }
373 }
379 }
384 }
388 }
392 }
397 }
399 /* IE6 sets dynamically generated links as visited. */
401 </style>
402 </head>
403 <body>
405 <h1>
406 git-svn(1) Manual Page
407 </h1>
410 <p>git-svn -
411 Bidirectional operation between a Subversion repository and git
412 </p>
413 </div>
414 </div>
418 </div>
421 <div class="paragraph"><p><em>git svn</em> is a simple conduit for changesets between Subversion and git.
422 It provides a bidirectional flow of changes between a Subversion and a git
423 repository.</p></div>
425 following the common "trunk/branches/tags" layout, with the --stdlayout option.
426 It can also follow branches and tags in any layout with the -T/-t/-b options
428 <div class="paragraph"><p>Once tracking a Subversion repository (with any of the above methods), the git
431 </div>
437 </dt>
438 <dd>
439 <p>
440 Initializes an empty git repository with additional
442 may be specified as a command-line argument, or as full
443 URL arguments to -T/-t/-b. Optionally, the target
444 directory to operate on can be specified as a second
445 argument. Normally this command initializes the current
446 directory.
447 </p>
451 </dt>
454 </dt>
457 </dt>
460 </dt>
463 </dt>
466 </dt>
468 -s
469 </dt>
471 --stdlayout
472 </dt>
473 <dd>
474 <p>
475 These are optional command-line options for init. Each of
476 these flags can point to a relative repository path
477 (--tags=project/tags) or a full url
478 (--tags=https://foo.org/project/tags).
479 You can specify more than one --tags and/or --branches options, in case
480 your Subversion repository places tags or branches under multiple paths.
481 The option --stdlayout is
482 a shorthand way of setting trunk,tags,branches as the relative paths,
483 which is the Subversion default. If any of the other options are given
484 as well, they take precedence.
485 </p>
486 </dd>
488 --no-metadata
489 </dt>
490 <dd>
491 <p>
494 section of this manpage before using this option.
495 </p>
496 </dd>
498 --use-svm-props
499 </dt>
500 <dd>
501 <p>
503 </p>
504 </dd>
506 --use-svnsync-props
507 </dt>
508 <dd>
509 <p>
511 </p>
512 </dd>
515 </dt>
516 <dd>
517 <p>
519 </p>
520 </dd>
523 </dt>
524 <dd>
525 <p>
527 </p>
528 </dd>
531 </dt>
532 <dd>
533 <p>
534 For transports that SVN handles authentication for (http,
535 https, and plain svn), specify the username. For other
536 transports (eg svn+ssh://), you must include the username in
537 the URL, eg svn+ssh://foo@svn.bar.com/project
538 </p>
539 </dd>
542 </dt>
543 <dd>
544 <p>
545 This allows one to specify a prefix which is prepended
546 to the names of remotes if trunk/branches/tags are
547 specified. The prefix does not automatically include a
548 trailing slash, so be sure you include one in the
549 argument if that is what you want. If --branches/-b is
550 specified, the prefix must include a trailing slash.
551 Setting a prefix is useful if you wish to track multiple
552 projects that share a common repository.
553 </p>
554 </dd>
557 </dt>
558 <dd>
559 <p>
563 </p>
564 </dd>
566 --no-minimize-url
567 </dt>
568 <dd>
569 <p>
570 When tracking multiple directories (using --stdlayout,
571 --branches, or --tags options), git svn will attempt to connect
572 to the root (or highest allowed level) of the Subversion
573 repository. This default allows better tracking of history if
574 entire projects are moved within a repository, but may cause
575 issues on repositories where read access restrictions are in
577 accept URLs as-is without attempting to connect to a higher
578 level directory. This option is off by default when only
579 one URL/branch is tracked (it would do little good).
580 </p>
581 </dd>
582 </dl></div>
583 </dd>
586 </dt>
587 <dd>
588 <p>
589 Fetch unfetched revisions from the Subversion remote we are
590 tracking. The name of the [svn-remote "…"] section in the
591 .git/config file may be specified as an optional command-line
592 argument.
593 </p>
596 --localtime
597 </dt>
598 <dd>
599 <p>
600 Store Git commit times in the local timezone instead of UTC. This
603 </p>
605 repository you cloned from, but if you wish for your local Git
606 repository to be able to interoperate with someone else’s local Git
607 repository, either don’t use this option or you should both use it in
608 the same local timezone.</p></div>
609 </dd>
611 --parent
612 </dt>
613 <dd>
614 <p>
615 Fetch only from the SVN parent of the current HEAD.
616 </p>
617 </dd>
620 </dt>
621 <dd>
622 <p>
623 This allows one to specify a Perl regular expression that will
624 cause skipping of all matching paths from checkout from SVN.
628 </p>
632 </div></div>
634 also given, both regular expressions will be used.</p></div>
638 Skip "doc*" directory for every fetch
639 </dt>
640 <dd>
644 </div></div>
645 </dd>
648 </dt>
649 <dd>
653 </div></div>
654 </dd>
655 </dl></div>
656 </dd>
658 --use-log-author
659 </dt>
660 <dd>
661 <p>
662 When retrieving svn commits into git (as part of fetch, rebase, or
663 dcommit operations), look for the first From: or Signed-off-by: line
664 in the log message and use that as the author string.
665 </p>
666 </dd>
668 --add-author-from
669 </dt>
670 <dd>
671 <p>
672 When committing to svn from git (as part of commit or dcommit
673 operations), if the existing log message doesn’t already have a
674 From: or Signed-off-by: line, append a From: line based on the
675 git commit’s author string. If you use this, then --use-log-author
676 will retrieve a valid author string for all commits.
677 </p>
678 </dd>
679 </dl></div>
680 </dd>
683 </dt>
684 <dd>
685 <p>
687 directory based on the basename of the URL passed to it;
688 or if a second argument is passed; it will create a directory
689 and work within that. It accepts all arguments that the
694 able to update the working tree with the latest changes.
695 </p>
696 </dd>
699 </dt>
700 <dd>
701 <p>
702 This fetches revisions from the SVN parent of the current HEAD
703 and rebases the current (uncommitted to SVN) work against it.
704 </p>
705 <div class="paragraph"><p>This works similarly to <tt>svn update</tt> or <em>git pull</em> except that
708 <div class="paragraph"><p>This accepts all options that <em>git svn fetch</em> and <em>git rebase</em>
710 [svn-remote], and not all [svn-remote] definitions.</p></div>
711 <div class="paragraph"><p>Like <em>git rebase</em>; this requires that the working tree be clean
712 and have no uncommitted changes.</p></div>
715 -l
716 </dt>
718 --local
719 </dt>
720 <dd>
721 <p>
723 last fetched commit from the upstream SVN.
724 </p>
725 </dd>
726 </dl></div>
727 </dd>
730 </dt>
731 <dd>
732 <p>
733 Commit each diff from a specified head directly to the SVN
734 repository, and then rebase or reset (depending on whether or
735 not there is a diff between SVN and head). This will create
736 a revision in SVN for each commit in git.
738 pull or merge) your commits against the latest changes in the
739 SVN repository.
740 An optional revision or branch argument may be specified, and
742 instead of HEAD.
744 cleaner, more linear history.
745 </p>
748 --no-rebase
749 </dt>
750 <dd>
751 <p>
752 After committing, do not rebase or reset.
753 </p>
754 </dd>
757 </dt>
758 <dd>
759 <p>
760 Commit to this SVN URL (the full path). This is intended to
763 reused if a user is later given access to an alternate transport
765 </p>
770 </div></div>
771 <div class="paragraph"><p>Using this option for any other purpose (don’t ask) is very strongly
772 discouraged.</p></div>
773 </dd>
776 </dt>
777 <dd>
778 <p>
779 Add the given merge information during the dcommit
781 store this information (as a property), and svn clients starting from
783 and does not set it automatically.
784 </p>
785 </dd>
786 </dl></div>
787 </dd>
790 </dt>
791 <dd>
792 <p>
793 Create a branch in the SVN repository.
794 </p>
797 -m
798 </dt>
800 --message
801 </dt>
802 <dd>
803 <p>
804 Allows to specify the commit message.
805 </p>
806 </dd>
808 -t
809 </dt>
811 --tag
812 </dt>
813 <dd>
814 <p>
815 Create a tag by using the tags_subdir instead of the branches_subdir
816 specified during git svn init.
817 </p>
818 </dd>
820 -d
821 </dt>
823 --destination
824 </dt>
825 <dd>
826 <p>
829 tag) you wish to create in the SVN repository. The value of this
830 option must match one of the paths specified by a --branches (or
831 --tags) option. You can see these paths with the commands
832 </p>
837 </div></div>
838 <div class="paragraph"><p>where <name> is the name of the SVN repository as specified by the -R option to
840 </dd>
842 --username
843 </dt>
844 <dd>
845 <p>
846 Specify the SVN username to perform the commit as. This option overrides
848 </p>
849 </dd>
851 --commit-url
852 </dt>
853 <dd>
854 <p>
855 Use the specified URL to connect to the destination Subversion
856 repository. This is useful in cases where the source SVN
857 repository is read-only. This option overrides configuration
859 </p>
863 </div></div>
864 </dd>
865 </dl></div>
866 </dd>
869 </dt>
870 <dd>
871 <p>
872 Create a tag in the SVN repository. This is a shorthand for
874 </p>
875 </dd>
878 </dt>
879 <dd>
880 <p>
881 This should make it easy to look up svn log messages when svn
882 users refer to -r/--revision numbers.
883 </p>
884 <div class="paragraph"><p>The following features from ‘svn log’ are supported:</p></div>
888 </dt>
891 </dt>
892 <dd>
893 <p>
894 is supported, non-numeric args are not:
895 HEAD, NEXT, BASE, PREV, etc …
896 </p>
897 </dd>
899 -v
900 </dt>
902 --verbose
903 </dt>
904 <dd>
905 <p>
906 it’s not completely compatible with the --verbose
907 output in svn log, but reasonably close.
908 </p>
909 </dd>
912 </dt>
913 <dd>
914 <p>
915 is NOT the same as --max-count, doesn’t count
916 merged/excluded commits
917 </p>
918 </dd>
920 --incremental
921 </dt>
922 <dd>
923 <p>
924 supported
925 </p>
926 </dd>
927 </dl></div>
931 --show-commit
932 </dt>
933 <dd>
934 <p>
935 shows the git commit sha1, as well
936 </p>
937 </dd>
939 --oneline
940 </dt>
941 <dd>
942 <p>
943 our version of --pretty=oneline
944 </p>
945 </dd>
946 </dl></div>
948 <table><tr>
951 </td>
953 client converts the UTC time to the local time (or based on the TZ=
954 environment). This command has the same behaviour.</td>
955 </tr></table>
956 </div>
958 </dd>
961 </dt>
962 <dd>
963 <p>
964 Show what revision and author last modified each line of a file. The
965 output of this mode is format-compatible with the output of
967 local uncommitted changes in the working copy are ignored;
968 the version of the file in the HEAD revision is annotated. Unknown
970 </p>
973 --git-format
974 </dt>
975 <dd>
976 <p>
978 SVN revision numbers instead of git commit hashes. In this mode,
979 changes that haven’t been committed to SVN (including local
980 working-copy edits) are shown as revision 0.
981 </p>
982 </dd>
983 </dl></div>
984 </dd>
987 </dt>
988 <dd>
989 <p>
991 corresponding git commit hash (this can optionally be followed by a
992 tree-ish to specify which branch should be searched). When given a
993 tree-ish, returns the corresponding SVN revision number.
994 </p>
995 </dd>
998 </dt>
999 <dd>
1000 <p>
1002 Commit specified commit or tree objects to SVN. This relies on
1003 your imported fetch data being up-to-date. This makes
1004 absolutely no attempts to do patching when committing to SVN, it
1005 simply overwrites files with those specified in the tree or
1006 commit. All merging is assumed to have taken place
1008 </p>
1009 </dd>
1012 </dt>
1013 <dd>
1014 <p>
1015 Recursively finds the svn:ignore property on directories and
1016 creates matching .gitignore files. The resulting files are staged to
1017 be committed, but are not committed. Use -r/--revision to refer to a
1018 specific revision.
1019 </p>
1020 </dd>
1023 </dt>
1024 <dd>
1025 <p>
1026 Recursively finds and lists the svn:ignore property on
1027 directories. The output is suitable for appending to
1028 the $GIT_DIR/info/exclude file.
1029 </p>
1030 </dd>
1033 </dt>
1034 <dd>
1035 <p>
1036 Attempts to recreate empty directories that core git cannot track
1038 Empty directories are automatically recreated when using
1042 more information.)
1043 </p>
1044 </dd>
1047 </dt>
1048 <dd>
1049 <p>
1050 Commits the diff of two tree-ish arguments from the
1051 command-line. This command does not rely on being inside an <tt>git svn
1052 init</tt>-ed repository. This command takes three arguments, (a) the
1053 original tree to diff against, (b) the new tree result, (c) the
1054 URL of the target Subversion repository. The final argument
1058 </p>
1059 </dd>
1062 </dt>
1063 <dd>
1064 <p>
1065 Shows information about a file or directory similar to what
1067 argument. Use the --url option to output only the value of the
1069 </p>
1070 </dd>
1073 </dt>
1074 <dd>
1075 <p>
1076 Lists the properties stored in the Subversion repository about a
1077 given file or directory. Use -r/--revision to refer to a specific
1078 Subversion revision.
1079 </p>
1080 </dd>
1083 </dt>
1084 <dd>
1085 <p>
1086 Gets the Subversion property given as the first argument, for a
1087 file. A specific revision can be specified with -r/--revision.
1088 </p>
1089 </dd>
1092 </dt>
1093 <dd>
1094 <p>
1095 Shows the Subversion externals. Use -r/--revision to specify a
1096 specific revision.
1097 </p>
1098 </dd>
1101 </dt>
1102 <dd>
1103 <p>
1106 </p>
1107 </dd>
1110 </dt>
1111 <dd>
1112 <p>
1116 should not be necessary. However, if SVN permissions change,
1118 with "not found in commit" (file not previously visible) or
1119 "checksum mismatch" (missed a modification). If the problem
1120 file cannot be ignored forever (with --ignore-paths) the only
1122 </p>
1123 <div class="paragraph"><p>Only the rev_map and refs/remotes/git-svn are changed. Follow <em>reset</em>
1125 branches onto the new tree.</p></div>
1129 </dt>
1132 </dt>
1133 <dd>
1134 <p>
1135 Specify the most recent revision to keep. All later revisions
1136 are discarded.
1137 </p>
1138 </dd>
1140 -p
1141 </dt>
1143 --parent
1144 </dt>
1145 <dd>
1146 <p>
1147 Discard the specified revision as well, keeping the nearest
1148 parent instead.
1149 </p>
1150 </dd>
1152 Example:
1153 </dt>
1154 <dd>
1155 <p>
1157 </p>
1160 <pre><tt> r1---r2---r3 remotes/git-svn
1161 \
1162 A---B master</tt></pre>
1163 </div></div>
1165 be incomplete in the first place. Then:</p></div>
1168 git svn fetch</div>
1170 </div></div>
1173 <pre><tt> r1---r2'--r3' remotes/git-svn
1174 \
1175 r2---r3---A---B master</tt></pre>
1176 </div></div>
1183 </div></div>
1186 <pre><tt> r1---r2'--r3' remotes/git-svn
1187 \
1188 A'--B' master</tt></pre>
1189 </div></div>
1190 </dd>
1191 </dl></div>
1192 </dd>
1193 </dl></div>
1194 </div>
1199 --shared[=(false|true|umask|group|all|world|everybody)]
1200 </dt>
1203 </dt>
1204 <dd>
1205 <p>
1208 </p>
1209 </dd>
1212 </dt>
1215 </dt>
1216 <dd>
1217 <p>
1219 </p>
1221 to be supported. $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges),
1222 $NUMBER:HEAD, and BASE:$NUMBER are all supported.</p></div>
1224 but is generally not recommended because history will be skipped
1225 and lost.</p></div>
1226 </dd>
1228 -
1229 </dt>
1231 --stdin
1232 </dt>
1233 <dd>
1234 <p>
1236 </p>
1238 order. Only the leading sha1 is read from each line, so
1240 </dd>
1242 --rmdir
1243 </dt>
1244 <dd>
1245 <p>
1247 </p>
1249 behind. SVN can version empty directories, and they are not
1250 removed by default if there are no files left in them. git
1251 cannot version empty directories. Enabling this flag will make
1252 the commit to SVN act like git.</p></div>
1256 </div></div>
1257 </dd>
1259 -e
1260 </dt>
1262 --edit
1263 </dt>
1264 <dd>
1265 <p>
1267 </p>
1269 default for objects that are commits, and forced on when committing
1270 tree objects.</p></div>
1274 </div></div>
1275 </dd>
1278 </dt>
1280 --find-copies-harder
1281 </dt>
1282 <dd>
1283 <p>
1285 </p>
1290 config key: svn.findcopiesharder</div>
1292 </div></div>
1293 </dd>
1296 </dt>
1299 </dt>
1300 <dd>
1301 <p>
1303 </p>
1307 </div></div>
1310 will abort operation. The user will then have to add the
1312 after the authors-file is modified should continue operation.</p></div>
1316 </div></div>
1317 </dd>
1320 </dt>
1321 <dd>
1322 <p>
1323 If this option is specified, for each SVN committer name that
1324 does not exist in the authors file, the given file is executed
1325 with the committer name as the first argument. The program is
1326 expected to return a single line of the form "Name <email>",
1327 which will be treated as if included in the authors file.
1328 </p>
1329 </dd>
1331 -q
1332 </dt>
1334 --quiet
1335 </dt>
1336 <dd>
1337 <p>
1339 even less verbose.
1340 </p>
1341 </dd>
1344 </dt>
1347 </dt>
1348 <dd>
1349 <p>
1350 These should help keep disk usage sane for large fetches with
1351 many revisions.
1352 </p>
1354 to fetch before repacking. This defaults to repacking every
1359 config key: svn.repackflags</div>
1361 </div></div>
1362 </dd>
1364 -m
1365 </dt>
1367 --merge
1368 </dt>
1371 </dt>
1374 </dt>
1375 <dd>
1376 <p>
1378 </p>
1379 <div class="paragraph"><p>Passed directly to <em>git rebase</em> when using <em>dcommit</em> if a
1381 </dd>
1383 -n
1384 </dt>
1386 --dry-run
1387 </dt>
1388 <dd>
1389 <p>
1392 </p>
1393 <div class="paragraph"><p>For <em>dcommit</em>, print out the series of git arguments that would show
1394 which diffs would be committed to SVN.</p></div>
1395 <div class="paragraph"><p>For <em>rebase</em>, display the local branch associated with the upstream svn
1396 repository associated with the current branch and the URL of svn
1397 repository that will be fetched from.</p></div>
1398 <div class="paragraph"><p>For <em>branch</em> and <em>tag</em>, display the urls that will be used for copying when
1399 creating the branch or tag.</p></div>
1400 </dd>
1401 </dl></div>
1402 </div>
1408 </dt>
1411 </dt>
1412 <dd>
1413 <p>
1414 This sets GIT_SVN_ID (instead of using the environment). This
1415 allows the user to override the default refname to fetch from
1417 no longer require this switch as an argument.
1418 </p>
1419 </dd>
1422 </dt>
1425 </dt>
1426 <dd>
1427 <p>
1428 Specify the [svn-remote "<remote name>"] section to use,
1429 this allows SVN multiple repositories to be tracked.
1430 Default: "svn"
1431 </p>
1432 </dd>
1434 --follow-parent
1435 </dt>
1436 <dd>
1437 <p>
1438 This is especially helpful when we’re tracking a directory
1439 that has been moved around within the repository, or if we
1440 started tracking a branch and never tracked the trunk it was
1441 descended from. This feature is enabled by default, use
1442 --no-follow-parent to disable it.
1443 </p>
1447 </div></div>
1448 </dd>
1449 </dl></div>
1450 </div>
1455 svn.noMetadata
1456 </dt>
1459 </dt>
1460 <dd>
1461 <p>
1463 </p>
1464 <div class="paragraph"><p>This option can only be used for one-shot imports as <em>git svn</em>
1465 will not be able to fetch again without metadata. Additionally,
1467 be able to rebuild them.</p></div>
1470 option for (hopefully) obvious reasons.</p></div>
1471 <div class="paragraph"><p>This option is NOT recommended as it makes it difficult to track down
1472 old references to SVN revision numbers in existing documentation, bug
1473 reports and archives. If you plan to eventually migrate from SVN to git
1474 and are certain about dropping SVN history, consider
1476 reformatting of metadata for ease-of-reading and rewriting authorship
1478 </dd>
1480 svn.useSvmProps
1481 </dt>
1484 </dt>
1485 <dd>
1486 <p>
1488 mirrors created using SVN::Mirror (or svk) for metadata.
1489 </p>
1491 that the revision was created by SVN::Mirror (also used by SVK).
1492 The property contains a repository UUID and a revision. We want
1493 to make it look like we are mirroring the original URL, so
1494 introduce a helper function that returns the original identity
1495 URL and UUID, and use it when generating metadata in commit
1496 messages.</p></div>
1497 </dd>
1499 svn.useSvnsyncProps
1500 </dt>
1503 </dt>
1504 <dd>
1505 <p>
1506 Similar to the useSvmProps option; this is for users
1508 later.
1509 </p>
1510 </dd>
1513 </dt>
1514 <dd>
1515 <p>
1516 This allows users to create repositories from alternate
1518 server locally (accessing via file://) but wish to distribute
1519 the repository with a public http:// or svn:// URL in the
1520 metadata so users of it will see the public URL.
1521 </p>
1522 </dd>
1525 </dt>
1526 <dd>
1527 <p>
1528 Similar to the useSvmProps option; this is for users who need
1529 to remap the UUID manually. This may be useful in situations
1530 where the original UUID is not available via either useSvmProps
1531 or useSvnsyncProps.
1532 </p>
1533 </dd>
1536 </dt>
1537 <dd>
1538 <p>
1541 via a read-only transport, to provide an alternate read/write
1542 transport. It is assumed that both keys point to the same
1545 takes precedence.
1546 </p>
1547 </dd>
1549 svn.brokenSymlinkWorkaround
1550 </dt>
1551 <dd>
1552 <p>
1553 This disables potentially expensive checks to workaround
1554 broken symlinks checked into SVN by broken clients. Set this
1555 option to "false" if you track a SVN repository with many
1556 empty blobs that are not symlinks. This option may be changed
1559 be "true".
1560 </p>
1561 </dd>
1563 svn.pathnameencoding
1564 </dt>
1565 <dd>
1566 <p>
1567 This instructs git svn to recode pathnames to a given encoding.
1568 It can be used by windows users and by those who work in non-utf8
1569 locales to avoid corrupted file names with non-ASCII characters.
1570 Valid encodings are the ones supported by Perl’s Encode module.
1571 </p>
1572 </dd>
1575 </dt>
1576 <dd>
1577 <p>
1579 attempt to recreate empty directories that are in the
1580 Subversion repository. If this option is set to "false", then
1581 empty directories will only be created if the "git svn mkdirs"
1583 option to be "true".
1584 </p>
1585 </dd>
1586 </dl></div>
1587 <div class="paragraph"><p>Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps
1590 and these settings should never be changed once they are set.</p></div>
1593 for rewriteRoot and rewriteUUID which can be used together.</p></div>
1594 </div>
1597 <div class="paragraph"><p>Tracking and contributing to the trunk of a Subversion-managed project:</p></div>
1600 <pre><tt># Clone a repo (like git clone):
1601 git svn clone http://svn.example.com/project/trunk
1602 # Enter the newly cloned directory:
1603 cd trunk
1604 # You should be on master branch, double-check with 'git branch'
1605 git branch
1606 # Do some work and commit locally to git:
1607 git commit ...
1608 # Something is committed to SVN, rebase your local changes against the
1609 # latest changes in SVN:
1610 git svn rebase
1611 # Now commit your changes (that were committed previously using git) to SVN,
1612 # as well as automatically updating your working HEAD:
1613 git svn dcommit
1614 # Append svn:ignore settings to the default git exclude file:
1616 </div></div>
1618 (complete with a trunk, tags and branches):</p></div>
1621 <pre><tt># Clone a repo (like git clone):
1622 git svn clone http://svn.example.com/project -T trunk -b branches -t tags
1623 # View all branches and tags you have cloned:
1624 git branch -r
1625 # Create a new branch in SVN
1626 git svn branch waldo
1627 # Reset your master to trunk (or any other branch, replacing 'trunk'
1628 # with the appropriate name):
1629 git reset --hard remotes/trunk
1630 # You may only dcommit to one branch/tag/trunk at a time. The usage
1631 # of dcommit/rebase/show-ignore should be the same as above.</tt></pre>
1632 </div></div>
1634 (especially for large Subversion repositories). If multiple
1635 people (or one person with multiple machines) want to use
1641 <pre><tt># Do the initial import on a server
1642 ssh server "cd /pub && git svn clone http://svn.example.com/project
1643 # Clone locally - make sure the refs/remotes/ space matches the server
1644 mkdir project
1645 cd project
1646 git init
1647 git remote add origin server:/pub/project
1648 git config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
1649 git fetch
1650 # Prevent fetch/pull from remote git server in the future,
1651 # we only want to use git svn for future updates
1652 git config --remove-section remote.origin
1653 # Create a local branch from one of the branches just fetched
1654 git checkout -b master FETCH_HEAD
1655 # Initialize 'git svn' locally (be sure to use the same URL and -T/-b/-t options as were used on server)
1656 git svn init http://svn.example.com/project
1657 # Pull the latest changes from Subversion
1658 git svn rebase</tt></pre>
1659 </div></div>
1660 </div>
1663 <div class="paragraph"><p>Originally, <em>git svn</em> recommended that the <em>remotes/git-svn</em> branch be
1664 pulled or merged from. This is because the author favored
1665 <tt>git svn set-tree B</tt> to commit a single head rather than the
1666 <tt>git svn set-tree A..B</tt> notation to commit multiple commits.</p></div>
1667 <div class="paragraph"><p>If you use <tt>git svn set-tree A..B</tt> to commit several diffs and you do
1668 not have the latest remotes/git-svn merged into my-branch, you should
1669 use <tt>git svn rebase</tt> to update your work branch instead of <tt>git pull</tt> or
1670 <tt>git merge</tt>. <tt>pull</tt>/<tt>merge</tt> can cause non-linear history to be flattened
1671 when committing into SVN, which can lead to merge commits reversing
1672 previous commits in SVN.</p></div>
1673 </div>
1676 <div class="paragraph"><p>Merge tracking in Subversion is lacking and doing branched development
1677 with Subversion can be cumbersome as a result. While <em>git svn</em> can track
1678 copy history (including branches and tags) for repositories adopting a
1679 standard layout, it cannot yet represent merge history that happened
1680 inside git back upstream to SVN users. Therefore it is advised that
1681 users keep history as linear as possible inside git to ease
1682 compatibility with SVN (see the CAVEATS section below).</p></div>
1683 </div>
1686 <div class="paragraph"><p>For the sake of simplicity and interoperating with a less-capable system
1687 (SVN), it is recommended that all <em>git svn</em> users clone, fetch and dcommit
1688 directly from the SVN server, and avoid all <em>git clone</em>/<em>pull</em>/<em>merge</em>/<em>push</em>
1689 operations between git repositories and branches. The recommended
1690 method of exchanging code between git branches and users is
1691 <em>git format-patch</em> and <em>git am</em>, or just 'dcommit’ing to the SVN repository.</p></div>
1692 <div class="paragraph"><p>Running <em>git merge</em> or <em>git pull</em> is NOT recommended on a branch you
1693 plan to <em>dcommit</em> from. Subversion does not represent merges in any
1694 reasonable or useful fashion; so users using Subversion cannot see any
1695 merges you’ve made. Furthermore, if you merge or pull from a git branch
1696 that is a mirror of an SVN branch, <em>dcommit</em> may commit to the wrong
1697 branch.</p></div>
1698 <div class="paragraph"><p>If you do merge, note the following rule: <em>git svn dcommit</em> will
1699 attempt to commit on top of the SVN commit named in</p></div>
1702 <pre><tt>git log --grep=^git-svn-id: --first-parent -1</tt></pre>
1703 </div></div>
1704 <div class="paragraph"><p>You <em>must</em> therefore ensure that the most recent commit of the branch
1705 you want to dcommit to is the <em>first</em> parent of the merge. Chaos will
1706 ensue otherwise, especially if the first parent is an older commit on
1707 the same SVN branch.</p></div>
1708 <div class="paragraph"><p><em>git clone</em> does not clone branches under the refs/remotes/ hierarchy or
1709 any <em>git svn</em> metadata, or config. So repositories created and managed with
1710 using <em>git svn</em> should use <em>rsync</em> for cloning, if cloning is to be done
1711 at all.</p></div>
1712 <div class="paragraph"><p>Since <em>dcommit</em> uses rebase internally, any git branches you <em>git push</em> to
1713 before <em>dcommit</em> on will require forcing an overwrite of the existing ref
1714 on the remote repository. This is generally considered bad practice,
1716 <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
1717 already dcommitted. It is considered bad practice to --amend commits
1718 you’ve already pushed to a remote repository for other users, and
1719 dcommit with SVN is analogous to that.</p></div>
1720 <div class="paragraph"><p>When using multiple --branches or --tags, <em>git svn</em> does not automatically
1721 handle name collisions (for example, if two branches from different paths have
1722 the same name, or if a branch and a tag have the same name). In these cases,
1723 use <em>init</em> to set up your git repository then, before your first <em>fetch</em>, edit
1724 the .git/config file so that the branches and tags are associated with
1725 different name spaces. For example:</p></div>
1728 <pre><tt>branches = stable/*:refs/remotes/svn/stable/*
1729 branches = debug/*:refs/remotes/svn/debug/*</tt></pre>
1730 </div></div>
1731 </div>
1735 properties are logged to $GIT_DIR/svn/<refname>/unhandled.log</p></div>
1737 tracked when committing to SVN. I do not plan on adding support for
1738 this as it’s quite difficult and time-consuming to get working for all
1739 the possible corner cases (git doesn’t do it, either). Committing
1740 renamed and copied files are fully supported if they’re similar enough
1741 for git to detect them.</p></div>
1742 </div>
1745 <div class="paragraph"><p><em>git svn</em> stores [svn-remote] configuration information in the
1746 repository .git/config file. It is similar the core git
1747 [remote] sections except <em>fetch</em> keys do not accept glob
1748 arguments; but they are instead handled by the <em>branches</em>
1749 and <em>tags</em> keys. Since some SVN repositories are oddly
1750 configured with multiple projects glob expansions such those
1751 listed below are allowed:</p></div>
1755 url = http://server.org/svn
1756 fetch = trunk/project-a:refs/remotes/project-a/trunk
1757 branches = branches/*/project-a:refs/remotes/project-a/branches/*
1758 tags = tags/*/project-a:refs/remotes/project-a/tags/*</tt></pre>
1759 </div></div>
1760 <div class="paragraph"><p>Keep in mind that the <em>*</em> (asterisk) wildcard of the local ref
1761 (right of the <em>:</em>) <strong>must</strong> be the farthest right path component;
1762 however the remote wildcard may be anywhere as long as it’s an
1763 independent path component (surrounded by <em>/</em> or EOL). This
1764 type of configuration is not automatically created by <em>init</em> and
1765 should be manually entered with a text-editor or using <em>git config</em>.</p></div>
1767 comma-separated list of names within braces. For example:</p></div>
1771 url = http://server.org/svn
1772 fetch = trunk/src:refs/remotes/trunk
1773 branches = branches/{red,green}/src:refs/remotes/branches/*
1774 tags = tags/{1.0,2.0}/src:refs/remotes/tags/*</tt></pre>
1775 </div></div>
1776 <div class="paragraph"><p>Note that git-svn keeps track of the highest revision in which a branch
1777 or tag has appeared. If the subset of branches or tags is changed after
1778 fetching, then .git/svn/.metadata must be manually edited to remove (or
1779 reset) branches-maxRev and/or tags-maxRev as appropriate.</p></div>
1780 </div>
1784 </div>
1788 </div>
1791 Last updated 2011-04-27 21:09:28 UTC
1792 </div>
1793 </div>
1794 </body>
1795 </html>