| blob | 1af80eb4b10aa4a555f798f45fe20e905e3a4e04 |
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>
420 </div></div>
421 </div>
424 <div class="paragraph"><p><em>git svn</em> is a simple conduit for changesets between Subversion and git.
425 It provides a bidirectional flow of changes between a Subversion and a git
426 repository.</p></div>
428 following the common "trunk/branches/tags" layout, with the --stdlayout option.
429 It can also follow branches and tags in any layout with the -T/-t/-b options
431 <div class="paragraph"><p>Once tracking a Subversion repository (with any of the above methods), the git
434 </div>
440 </dt>
441 <dd>
442 <p>
443 Initializes an empty git repository with additional
445 may be specified as a command-line argument, or as full
446 URL arguments to -T/-t/-b. Optionally, the target
447 directory to operate on can be specified as a second
448 argument. Normally this command initializes the current
449 directory.
450 </p>
454 </dt>
457 </dt>
460 </dt>
463 </dt>
466 </dt>
469 </dt>
471 -s
472 </dt>
474 --stdlayout
475 </dt>
476 <dd>
477 <p>
478 These are optional command-line options for init. Each of
479 these flags can point to a relative repository path
480 (--tags=project/tags) or a full url
481 (--tags=https://foo.org/project/tags).
482 You can specify more than one --tags and/or --branches options, in case
483 your Subversion repository places tags or branches under multiple paths.
484 The option --stdlayout is
485 a shorthand way of setting trunk,tags,branches as the relative paths,
486 which is the Subversion default. If any of the other options are given
487 as well, they take precedence.
488 </p>
489 </dd>
491 --no-metadata
492 </dt>
493 <dd>
494 <p>
497 section of this manpage before using this option.
498 </p>
499 </dd>
501 --use-svm-props
502 </dt>
503 <dd>
504 <p>
506 </p>
507 </dd>
509 --use-svnsync-props
510 </dt>
511 <dd>
512 <p>
514 </p>
515 </dd>
518 </dt>
519 <dd>
520 <p>
522 </p>
523 </dd>
526 </dt>
527 <dd>
528 <p>
530 </p>
531 </dd>
534 </dt>
535 <dd>
536 <p>
537 For transports that SVN handles authentication for (http,
538 https, and plain svn), specify the username. For other
539 transports (eg svn+ssh://), you must include the username in
540 the URL, eg svn+ssh://foo@svn.bar.com/project
541 </p>
542 </dd>
545 </dt>
546 <dd>
547 <p>
548 This allows one to specify a prefix which is prepended
549 to the names of remotes if trunk/branches/tags are
550 specified. The prefix does not automatically include a
551 trailing slash, so be sure you include one in the
552 argument if that is what you want. If --branches/-b is
553 specified, the prefix must include a trailing slash.
554 Setting a prefix is useful if you wish to track multiple
555 projects that share a common repository.
556 </p>
557 </dd>
560 </dt>
561 <dd>
562 <p>
566 </p>
567 </dd>
569 --no-minimize-url
570 </dt>
571 <dd>
572 <p>
573 When tracking multiple directories (using --stdlayout,
574 --branches, or --tags options), git svn will attempt to connect
575 to the root (or highest allowed level) of the Subversion
576 repository. This default allows better tracking of history if
577 entire projects are moved within a repository, but may cause
578 issues on repositories where read access restrictions are in
580 accept URLs as-is without attempting to connect to a higher
581 level directory. This option is off by default when only
582 one URL/branch is tracked (it would do little good).
583 </p>
584 </dd>
585 </dl></div>
586 </dd>
589 </dt>
590 <dd>
591 <p>
592 Fetch unfetched revisions from the Subversion remote we are
593 tracking. The name of the [svn-remote "…"] section in the
594 .git/config file may be specified as an optional command-line
595 argument.
596 </p>
599 --localtime
600 </dt>
601 <dd>
602 <p>
603 Store Git commit times in the local timezone instead of UTC. This
606 </p>
608 repository you cloned from, but if you wish for your local Git
609 repository to be able to interoperate with someone else’s local Git
610 repository, either don’t use this option or you should both use it in
611 the same local timezone.</p></div>
612 </dd>
614 --parent
615 </dt>
616 <dd>
617 <p>
618 Fetch only from the SVN parent of the current HEAD.
619 </p>
620 </dd>
623 </dt>
624 <dd>
625 <p>
626 This allows one to specify a Perl regular expression that will
627 cause skipping of all matching paths from checkout from SVN.
631 </p>
635 </div></div>
637 also given, both regular expressions will be used.</p></div>
641 Skip "doc*" directory for every fetch
642 </dt>
643 <dd>
647 </div></div>
648 </dd>
651 </dt>
652 <dd>
656 </div></div>
657 </dd>
658 </dl></div>
659 </dd>
660 </dl></div>
661 </dd>
664 </dt>
665 <dd>
666 <p>
668 directory based on the basename of the URL passed to it;
669 or if a second argument is passed; it will create a directory
670 and work within that. It accepts all arguments that the
675 able to update the working tree with the latest changes.
676 </p>
677 </dd>
680 </dt>
681 <dd>
682 <p>
683 This fetches revisions from the SVN parent of the current HEAD
684 and rebases the current (uncommitted to SVN) work against it.
685 </p>
686 <div class="paragraph"><p>This works similarly to <tt>svn update</tt> or <em>git pull</em> except that
689 <div class="paragraph"><p>This accepts all options that <em>git svn fetch</em> and <em>git rebase</em>
691 [svn-remote], and not all [svn-remote] definitions.</p></div>
692 <div class="paragraph"><p>Like <em>git rebase</em>; this requires that the working tree be clean
693 and have no uncommitted changes.</p></div>
696 -l
697 </dt>
699 --local
700 </dt>
701 <dd>
702 <p>
704 last fetched commit from the upstream SVN.
705 </p>
706 </dd>
707 </dl></div>
708 </dd>
711 </dt>
712 <dd>
713 <p>
714 Commit each diff from a specified head directly to the SVN
715 repository, and then rebase or reset (depending on whether or
716 not there is a diff between SVN and head). This will create
717 a revision in SVN for each commit in git.
719 pull or merge) your commits against the latest changes in the
720 SVN repository.
721 An optional revision or branch argument may be specified, and
723 instead of HEAD.
725 cleaner, more linear history.
726 </p>
729 --no-rebase
730 </dt>
731 <dd>
732 <p>
733 After committing, do not rebase or reset.
734 </p>
735 </dd>
738 </dt>
739 <dd>
740 <p>
741 Commit to this SVN URL (the full path). This is intended to
744 reused if a user is later given access to an alternate transport
746 </p>
751 </div></div>
752 <div class="paragraph"><p>Using this option for any other purpose (don’t ask) is very strongly
753 discouraged.</p></div>
754 </dd>
757 </dt>
758 <dd>
759 <p>
760 Add the given merge information during the dcommit
762 store this information (as a property), and svn clients starting from
764 and does not set it automatically.
765 </p>
766 </dd>
767 </dl></div>
768 </dd>
771 </dt>
772 <dd>
773 <p>
774 Create a branch in the SVN repository.
775 </p>
778 -m
779 </dt>
781 --message
782 </dt>
783 <dd>
784 <p>
785 Allows to specify the commit message.
786 </p>
787 </dd>
789 -t
790 </dt>
792 --tag
793 </dt>
794 <dd>
795 <p>
796 Create a tag by using the tags_subdir instead of the branches_subdir
797 specified during git svn init.
798 </p>
799 </dd>
801 -d
802 </dt>
804 --destination
805 </dt>
806 <dd>
807 <p>
810 tag) you wish to create in the SVN repository. The value of this
811 option must match one of the paths specified by a --branches (or
812 --tags) option. You can see these paths with the commands
813 </p>
818 </div></div>
819 <div class="paragraph"><p>where <name> is the name of the SVN repository as specified by the -R option to
821 </dd>
823 --username
824 </dt>
825 <dd>
826 <p>
827 Specify the SVN username to perform the commit as. This option overrides
829 </p>
830 </dd>
832 --commit-url
833 </dt>
834 <dd>
835 <p>
836 Use the specified URL to connect to the destination Subversion
837 repository. This is useful in cases where the source SVN
838 repository is read-only. This option overrides configuration
840 </p>
844 </div></div>
845 </dd>
846 </dl></div>
847 </dd>
850 </dt>
851 <dd>
852 <p>
853 Create a tag in the SVN repository. This is a shorthand for
855 </p>
856 </dd>
859 </dt>
860 <dd>
861 <p>
862 This should make it easy to look up svn log messages when svn
863 users refer to -r/--revision numbers.
864 </p>
865 <div class="paragraph"><p>The following features from ‘svn log’ are supported:</p></div>
869 </dt>
872 </dt>
873 <dd>
874 <p>
875 is supported, non-numeric args are not:
876 HEAD, NEXT, BASE, PREV, etc …
877 </p>
878 </dd>
880 -v
881 </dt>
883 --verbose
884 </dt>
885 <dd>
886 <p>
887 it’s not completely compatible with the --verbose
888 output in svn log, but reasonably close.
889 </p>
890 </dd>
893 </dt>
894 <dd>
895 <p>
896 is NOT the same as --max-count, doesn’t count
897 merged/excluded commits
898 </p>
899 </dd>
901 --incremental
902 </dt>
903 <dd>
904 <p>
905 supported
906 </p>
907 </dd>
908 </dl></div>
912 --show-commit
913 </dt>
914 <dd>
915 <p>
916 shows the git commit sha1, as well
917 </p>
918 </dd>
920 --oneline
921 </dt>
922 <dd>
923 <p>
924 our version of --pretty=oneline
925 </p>
926 </dd>
927 </dl></div>
929 <table><tr>
932 </td>
934 client converts the UTC time to the local time (or based on the TZ=
935 environment). This command has the same behaviour.</td>
936 </tr></table>
937 </div>
939 </dd>
942 </dt>
943 <dd>
944 <p>
945 Show what revision and author last modified each line of a file. The
946 output of this mode is format-compatible with the output of
948 local uncommitted changes in the working copy are ignored;
949 the version of the file in the HEAD revision is annotated. Unknown
951 </p>
954 --git-format
955 </dt>
956 <dd>
957 <p>
959 SVN revision numbers instead of git commit hashes. In this mode,
960 changes that haven’t been committed to SVN (including local
961 working-copy edits) are shown as revision 0.
962 </p>
963 </dd>
964 </dl></div>
965 </dd>
968 </dt>
969 <dd>
970 <p>
972 corresponding git commit hash (this can optionally be followed by a
973 tree-ish to specify which branch should be searched). When given a
974 tree-ish, returns the corresponding SVN revision number.
975 </p>
976 </dd>
979 </dt>
980 <dd>
981 <p>
983 Commit specified commit or tree objects to SVN. This relies on
984 your imported fetch data being up-to-date. This makes
985 absolutely no attempts to do patching when committing to SVN, it
986 simply overwrites files with those specified in the tree or
987 commit. All merging is assumed to have taken place
989 </p>
990 </dd>
993 </dt>
994 <dd>
995 <p>
996 Recursively finds the svn:ignore property on directories and
997 creates matching .gitignore files. The resulting files are staged to
998 be committed, but are not committed. Use -r/--revision to refer to a
999 specific revision.
1000 </p>
1001 </dd>
1004 </dt>
1005 <dd>
1006 <p>
1007 Recursively finds and lists the svn:ignore property on
1008 directories. The output is suitable for appending to
1009 the $GIT_DIR/info/exclude file.
1010 </p>
1011 </dd>
1014 </dt>
1015 <dd>
1016 <p>
1017 Attempts to recreate empty directories that core git cannot track
1019 Empty directories are automatically recreated when using
1023 more information.)
1024 </p>
1025 </dd>
1028 </dt>
1029 <dd>
1030 <p>
1031 Commits the diff of two tree-ish arguments from the
1032 command-line. This command does not rely on being inside an <tt>git svn
1033 init</tt>-ed repository. This command takes three arguments, (a) the
1034 original tree to diff against, (b) the new tree result, (c) the
1035 URL of the target Subversion repository. The final argument
1039 </p>
1040 </dd>
1043 </dt>
1044 <dd>
1045 <p>
1046 Shows information about a file or directory similar to what
1048 argument. Use the --url option to output only the value of the
1050 </p>
1051 </dd>
1054 </dt>
1055 <dd>
1056 <p>
1057 Lists the properties stored in the Subversion repository about a
1058 given file or directory. Use -r/--revision to refer to a specific
1059 Subversion revision.
1060 </p>
1061 </dd>
1064 </dt>
1065 <dd>
1066 <p>
1067 Gets the Subversion property given as the first argument, for a
1068 file. A specific revision can be specified with -r/--revision.
1069 </p>
1070 </dd>
1073 </dt>
1074 <dd>
1075 <p>
1076 Shows the Subversion externals. Use -r/--revision to specify a
1077 specific revision.
1078 </p>
1079 </dd>
1082 </dt>
1083 <dd>
1084 <p>
1087 </p>
1088 </dd>
1091 </dt>
1092 <dd>
1093 <p>
1097 should not be necessary. However, if SVN permissions change,
1099 with "not found in commit" (file not previously visible) or
1100 "checksum mismatch" (missed a modification). If the problem
1101 file cannot be ignored forever (with --ignore-paths) the only
1103 </p>
1104 <div class="paragraph"><p>Only the rev_map and refs/remotes/git-svn are changed. Follow <em>reset</em>
1106 branches onto the new tree.</p></div>
1110 </dt>
1113 </dt>
1114 <dd>
1115 <p>
1116 Specify the most recent revision to keep. All later revisions
1117 are discarded.
1118 </p>
1119 </dd>
1121 -p
1122 </dt>
1124 --parent
1125 </dt>
1126 <dd>
1127 <p>
1128 Discard the specified revision as well, keeping the nearest
1129 parent instead.
1130 </p>
1131 </dd>
1133 Example:
1134 </dt>
1135 <dd>
1136 <p>
1138 </p>
1141 <pre><tt> r1---r2---r3 remotes/git-svn
1142 \
1143 A---B master</tt></pre>
1144 </div></div>
1146 be incomplete in the first place. Then:</p></div>
1149 git svn fetch</div>
1151 </div></div>
1154 <pre><tt> r1---r2'--r3' remotes/git-svn
1155 \
1156 r2---r3---A---B master</tt></pre>
1157 </div></div>
1164 </div></div>
1167 <pre><tt> r1---r2'--r3' remotes/git-svn
1168 \
1169 A'--B' master</tt></pre>
1170 </div></div>
1171 </dd>
1172 </dl></div>
1173 </dd>
1174 </dl></div>
1175 </div>
1180 --shared[=(false|true|umask|group|all|world|everybody)]
1181 </dt>
1184 </dt>
1185 <dd>
1186 <p>
1189 </p>
1190 </dd>
1193 </dt>
1196 </dt>
1197 <dd>
1198 <p>
1200 </p>
1202 to be supported. $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges),
1203 $NUMBER:HEAD, and BASE:$NUMBER are all supported.</p></div>
1205 but is generally not recommended because history will be skipped
1206 and lost.</p></div>
1207 </dd>
1209 -
1210 </dt>
1212 --stdin
1213 </dt>
1214 <dd>
1215 <p>
1217 </p>
1219 order. Only the leading sha1 is read from each line, so
1221 </dd>
1223 --rmdir
1224 </dt>
1225 <dd>
1226 <p>
1228 </p>
1230 behind. SVN can version empty directories, and they are not
1231 removed by default if there are no files left in them. git
1232 cannot version empty directories. Enabling this flag will make
1233 the commit to SVN act like git.</p></div>
1237 </div></div>
1238 </dd>
1240 -e
1241 </dt>
1243 --edit
1244 </dt>
1245 <dd>
1246 <p>
1248 </p>
1250 default for objects that are commits, and forced on when committing
1251 tree objects.</p></div>
1255 </div></div>
1256 </dd>
1259 </dt>
1261 --find-copies-harder
1262 </dt>
1263 <dd>
1264 <p>
1266 </p>
1271 config key: svn.findcopiesharder</div>
1273 </div></div>
1274 </dd>
1277 </dt>
1280 </dt>
1281 <dd>
1282 <p>
1284 </p>
1288 </div></div>
1291 will abort operation. The user will then have to add the
1293 after the authors-file is modified should continue operation.</p></div>
1297 </div></div>
1298 </dd>
1301 </dt>
1302 <dd>
1303 <p>
1304 If this option is specified, for each SVN committer name that
1305 does not exist in the authors file, the given file is executed
1306 with the committer name as the first argument. The program is
1307 expected to return a single line of the form "Name <email>",
1308 which will be treated as if included in the authors file.
1309 </p>
1310 </dd>
1312 -q
1313 </dt>
1315 --quiet
1316 </dt>
1317 <dd>
1318 <p>
1320 even less verbose.
1321 </p>
1322 </dd>
1325 </dt>
1328 </dt>
1329 <dd>
1330 <p>
1331 These should help keep disk usage sane for large fetches with
1332 many revisions.
1333 </p>
1335 to fetch before repacking. This defaults to repacking every
1340 config key: svn.repackflags</div>
1342 </div></div>
1343 </dd>
1345 -m
1346 </dt>
1348 --merge
1349 </dt>
1352 </dt>
1355 </dt>
1356 <dd>
1357 <p>
1359 </p>
1360 <div class="paragraph"><p>Passed directly to <em>git rebase</em> when using <em>dcommit</em> if a
1362 </dd>
1364 -n
1365 </dt>
1367 --dry-run
1368 </dt>
1369 <dd>
1370 <p>
1373 </p>
1374 <div class="paragraph"><p>For <em>dcommit</em>, print out the series of git arguments that would show
1375 which diffs would be committed to SVN.</p></div>
1376 <div class="paragraph"><p>For <em>rebase</em>, display the local branch associated with the upstream svn
1377 repository associated with the current branch and the URL of svn
1378 repository that will be fetched from.</p></div>
1379 <div class="paragraph"><p>For <em>branch</em> and <em>tag</em>, display the urls that will be used for copying when
1380 creating the branch or tag.</p></div>
1381 </dd>
1383 --use-log-author
1384 </dt>
1385 <dd>
1386 <p>
1388 <em>dcommit</em> operations), look for the first <tt>From:</tt> or <tt>Signed-off-by:</tt> line
1389 in the log message and use that as the author string.
1390 </p>
1391 </dd>
1393 --add-author-from
1394 </dt>
1395 <dd>
1396 <p>
1397 When committing to svn from git (as part of <em>commit-diff</em>, <em>set-tree</em> or <em>dcommit</em>
1398 operations), if the existing log message doesn’t already have a
1401 will retrieve a valid author string for all commits.
1402 </p>
1403 </dd>
1404 </dl></div>
1405 </div>
1411 </dt>
1414 </dt>
1415 <dd>
1416 <p>
1417 This sets GIT_SVN_ID (instead of using the environment). This
1418 allows the user to override the default refname to fetch from
1420 no longer require this switch as an argument.
1421 </p>
1422 </dd>
1425 </dt>
1428 </dt>
1429 <dd>
1430 <p>
1431 Specify the [svn-remote "<remote name>"] section to use,
1432 this allows SVN multiple repositories to be tracked.
1433 Default: "svn"
1434 </p>
1435 </dd>
1437 --follow-parent
1438 </dt>
1439 <dd>
1440 <p>
1441 This is especially helpful when we’re tracking a directory
1442 that has been moved around within the repository, or if we
1443 started tracking a branch and never tracked the trunk it was
1444 descended from. This feature is enabled by default, use
1445 --no-follow-parent to disable it.
1446 </p>
1450 </div></div>
1451 </dd>
1452 </dl></div>
1453 </div>
1458 svn.noMetadata
1459 </dt>
1462 </dt>
1463 <dd>
1464 <p>
1466 </p>
1467 <div class="paragraph"><p>This option can only be used for one-shot imports as <em>git svn</em>
1468 will not be able to fetch again without metadata. Additionally,
1470 be able to rebuild them.</p></div>
1473 option for (hopefully) obvious reasons.</p></div>
1474 <div class="paragraph"><p>This option is NOT recommended as it makes it difficult to track down
1475 old references to SVN revision numbers in existing documentation, bug
1476 reports and archives. If you plan to eventually migrate from SVN to git
1477 and are certain about dropping SVN history, consider
1479 reformatting of metadata for ease-of-reading and rewriting authorship
1481 </dd>
1483 svn.useSvmProps
1484 </dt>
1487 </dt>
1488 <dd>
1489 <p>
1491 mirrors created using SVN::Mirror (or svk) for metadata.
1492 </p>
1494 that the revision was created by SVN::Mirror (also used by SVK).
1495 The property contains a repository UUID and a revision. We want
1496 to make it look like we are mirroring the original URL, so
1497 introduce a helper function that returns the original identity
1498 URL and UUID, and use it when generating metadata in commit
1499 messages.</p></div>
1500 </dd>
1502 svn.useSvnsyncProps
1503 </dt>
1506 </dt>
1507 <dd>
1508 <p>
1509 Similar to the useSvmProps option; this is for users
1511 later.
1512 </p>
1513 </dd>
1516 </dt>
1517 <dd>
1518 <p>
1519 This allows users to create repositories from alternate
1521 server locally (accessing via file://) but wish to distribute
1522 the repository with a public http:// or svn:// URL in the
1523 metadata so users of it will see the public URL.
1524 </p>
1525 </dd>
1528 </dt>
1529 <dd>
1530 <p>
1531 Similar to the useSvmProps option; this is for users who need
1532 to remap the UUID manually. This may be useful in situations
1533 where the original UUID is not available via either useSvmProps
1534 or useSvnsyncProps.
1535 </p>
1536 </dd>
1539 </dt>
1540 <dd>
1541 <p>
1544 via a read-only transport, to provide an alternate read/write
1545 transport. It is assumed that both keys point to the same
1548 takes precedence.
1549 </p>
1550 </dd>
1552 svn.brokenSymlinkWorkaround
1553 </dt>
1554 <dd>
1555 <p>
1556 This disables potentially expensive checks to workaround
1557 broken symlinks checked into SVN by broken clients. Set this
1558 option to "false" if you track a SVN repository with many
1559 empty blobs that are not symlinks. This option may be changed
1562 be "true".
1563 </p>
1564 </dd>
1566 svn.pathnameencoding
1567 </dt>
1568 <dd>
1569 <p>
1570 This instructs git svn to recode pathnames to a given encoding.
1571 It can be used by windows users and by those who work in non-utf8
1572 locales to avoid corrupted file names with non-ASCII characters.
1573 Valid encodings are the ones supported by Perl’s Encode module.
1574 </p>
1575 </dd>
1578 </dt>
1579 <dd>
1580 <p>
1582 attempt to recreate empty directories that are in the
1583 Subversion repository. If this option is set to "false", then
1584 empty directories will only be created if the "git svn mkdirs"
1586 option to be "true".
1587 </p>
1588 </dd>
1589 </dl></div>
1590 <div class="paragraph"><p>Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps
1593 and these settings should never be changed once they are set.</p></div>
1596 for rewriteRoot and rewriteUUID which can be used together.</p></div>
1597 </div>
1600 <div class="paragraph"><p>Tracking and contributing to the trunk of a Subversion-managed project:</p></div>
1603 <pre><tt># Clone a repo (like git clone):
1604 git svn clone http://svn.example.com/project/trunk
1605 # Enter the newly cloned directory:
1606 cd trunk
1607 # You should be on master branch, double-check with 'git branch'
1608 git branch
1609 # Do some work and commit locally to git:
1610 git commit ...
1611 # Something is committed to SVN, rebase your local changes against the
1612 # latest changes in SVN:
1613 git svn rebase
1614 # Now commit your changes (that were committed previously using git) to SVN,
1615 # as well as automatically updating your working HEAD:
1616 git svn dcommit
1617 # Append svn:ignore settings to the default git exclude file:
1619 </div></div>
1621 (complete with a trunk, tags and branches):</p></div>
1624 <pre><tt># Clone a repo (like git clone):
1625 git svn clone http://svn.example.com/project -T trunk -b branches -t tags
1626 # View all branches and tags you have cloned:
1627 git branch -r
1628 # Create a new branch in SVN
1629 git svn branch waldo
1630 # Reset your master to trunk (or any other branch, replacing 'trunk'
1631 # with the appropriate name):
1632 git reset --hard remotes/trunk
1633 # You may only dcommit to one branch/tag/trunk at a time. The usage
1634 # of dcommit/rebase/show-ignore should be the same as above.</tt></pre>
1635 </div></div>
1637 (especially for large Subversion repositories). If multiple
1638 people (or one person with multiple machines) want to use
1644 <pre><tt># Do the initial import on a server
1645 ssh server "cd /pub && git svn clone http://svn.example.com/project
1646 # Clone locally - make sure the refs/remotes/ space matches the server
1647 mkdir project
1648 cd project
1649 git init
1650 git remote add origin server:/pub/project
1651 git config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
1652 git fetch
1653 # Prevent fetch/pull from remote git server in the future,
1654 # we only want to use git svn for future updates
1655 git config --remove-section remote.origin
1656 # Create a local branch from one of the branches just fetched
1657 git checkout -b master FETCH_HEAD
1658 # Initialize 'git svn' locally (be sure to use the same URL and -T/-b/-t options as were used on server)
1659 git svn init http://svn.example.com/project
1660 # Pull the latest changes from Subversion
1661 git svn rebase</tt></pre>
1662 </div></div>
1663 </div>
1666 <div class="paragraph"><p>Originally, <em>git svn</em> recommended that the <em>remotes/git-svn</em> branch be
1667 pulled or merged from. This is because the author favored
1668 <tt>git svn set-tree B</tt> to commit a single head rather than the
1669 <tt>git svn set-tree A..B</tt> notation to commit multiple commits.</p></div>
1670 <div class="paragraph"><p>If you use <tt>git svn set-tree A..B</tt> to commit several diffs and you do
1671 not have the latest remotes/git-svn merged into my-branch, you should
1672 use <tt>git svn rebase</tt> to update your work branch instead of <tt>git pull</tt> or
1673 <tt>git merge</tt>. <tt>pull</tt>/<tt>merge</tt> can cause non-linear history to be flattened
1674 when committing into SVN, which can lead to merge commits reversing
1675 previous commits in SVN.</p></div>
1676 </div>
1680 copy history (including branches and tags) for repositories adopting a
1681 standard layout, it cannot yet represent merge history that happened
1682 inside git back upstream to SVN users. Therefore it is advised that
1683 users keep history as linear as possible inside git to ease
1684 compatibility with SVN (see the CAVEATS section below).</p></div>
1685 </div>
1689 it is recommended that all <em>git svn</em> users clone, fetch and dcommit
1690 directly from the SVN server, and avoid all <em>git clone</em>/<em>pull</em>/<em>merge</em>/<em>push</em>
1691 operations between git repositories and branches. The recommended
1692 method of exchanging code between git branches and users is
1693 <em>git format-patch</em> and <em>git am</em>, or just 'dcommit’ing to the SVN repository.</p></div>
1694 <div class="paragraph"><p>Running <em>git merge</em> or <em>git pull</em> is NOT recommended on a branch you
1695 plan to <em>dcommit</em> from because Subversion users cannot see any
1696 merges you’ve made. Furthermore, if you merge or pull from a git branch
1697 that is a mirror of an SVN branch, <em>dcommit</em> may commit to the wrong
1698 branch.</p></div>
1699 <div class="paragraph"><p>If you do merge, note the following rule: <em>git svn dcommit</em> will
1700 attempt to commit on top of the SVN commit named in</p></div>
1703 <pre><tt>git log --grep=^git-svn-id: --first-parent -1</tt></pre>
1704 </div></div>
1705 <div class="paragraph"><p>You <em>must</em> therefore ensure that the most recent commit of the branch
1706 you want to dcommit to is the <em>first</em> parent of the merge. Chaos will
1707 ensue otherwise, especially if the first parent is an older commit on
1708 the same SVN branch.</p></div>
1709 <div class="paragraph"><p><em>git clone</em> does not clone branches under the refs/remotes/ hierarchy or
1710 any <em>git svn</em> metadata, or config. So repositories created and managed with
1711 using <em>git svn</em> should use <em>rsync</em> for cloning, if cloning is to be done
1712 at all.</p></div>
1713 <div class="paragraph"><p>Since <em>dcommit</em> uses rebase internally, any git branches you <em>git push</em> to
1714 before <em>dcommit</em> on will require forcing an overwrite of the existing ref
1715 on the remote repository. This is generally considered bad practice,
1717 <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
1718 already dcommitted. It is considered bad practice to --amend commits
1719 you’ve already pushed to a remote repository for other users, and
1720 dcommit with SVN is analogous to that.</p></div>
1721 <div class="paragraph"><p>When using multiple --branches or --tags, <em>git svn</em> does not automatically
1722 handle name collisions (for example, if two branches from different paths have
1723 the same name, or if a branch and a tag have the same name). In these cases,
1724 use <em>init</em> to set up your git repository then, before your first <em>fetch</em>, edit
1725 the .git/config file so that the branches and tags are associated with
1726 different name spaces. For example:</p></div>
1729 <pre><tt>branches = stable/*:refs/remotes/svn/stable/*
1730 branches = debug/*:refs/remotes/svn/debug/*</tt></pre>
1731 </div></div>
1732 </div>
1736 properties are logged to $GIT_DIR/svn/<refname>/unhandled.log</p></div>
1738 tracked when committing to SVN. I do not plan on adding support for
1739 this as it’s quite difficult and time-consuming to get working for all
1740 the possible corner cases (git doesn’t do it, either). Committing
1741 renamed and copied files is fully supported if they’re similar enough
1742 for git to detect them.</p></div>
1743 </div>
1746 <div class="paragraph"><p><em>git svn</em> stores [svn-remote] configuration information in the
1747 repository .git/config file. It is similar the core git
1748 [remote] sections except <em>fetch</em> keys do not accept glob
1749 arguments; but they are instead handled by the <em>branches</em>
1750 and <em>tags</em> keys. Since some SVN repositories are oddly
1751 configured with multiple projects glob expansions such those
1752 listed below are allowed:</p></div>
1756 url = http://server.org/svn
1757 fetch = trunk/project-a:refs/remotes/project-a/trunk
1758 branches = branches/*/project-a:refs/remotes/project-a/branches/*
1759 tags = tags/*/project-a:refs/remotes/project-a/tags/*</tt></pre>
1760 </div></div>
1761 <div class="paragraph"><p>Keep in mind that the <em>*</em> (asterisk) wildcard of the local ref
1762 (right of the <em>:</em>) <strong>must</strong> be the farthest right path component;
1763 however the remote wildcard may be anywhere as long as it’s an
1764 independent path component (surrounded by <em>/</em> or EOL). This
1765 type of configuration is not automatically created by <em>init</em> and
1766 should be manually entered with a text-editor or using <em>git config</em>.</p></div>
1768 comma-separated list of names within braces. For example:</p></div>
1772 url = http://server.org/svn
1773 fetch = trunk/src:refs/remotes/trunk
1774 branches = branches/{red,green}/src:refs/remotes/branches/*
1775 tags = tags/{1.0,2.0}/src:refs/remotes/tags/*</tt></pre>
1776 </div></div>
1777 <div class="paragraph"><p>Note that git-svn keeps track of the highest revision in which a branch
1778 or tag has appeared. If the subset of branches or tags is changed after
1779 fetching, then .git/svn/.metadata must be manually edited to remove (or
1780 reset) branches-maxRev and/or tags-maxRev as appropriate.</p></div>
1781 </div>
1785 </div>
1789 </div>
1792 Last updated 2011-07-23 00:49:30 UTC
1793 </div>
1794 </div>
1795 </body>
1796 </html>