| blob | bddf7bce0e065b8f7451d0535b239c79a2296f6a |
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>
774 </dl></div>
775 </dd>
778 </dt>
779 <dd>
780 <p>
781 Create a branch in the SVN repository.
782 </p>
785 -m
786 </dt>
788 --message
789 </dt>
790 <dd>
791 <p>
792 Allows to specify the commit message.
793 </p>
794 </dd>
796 -t
797 </dt>
799 --tag
800 </dt>
801 <dd>
802 <p>
803 Create a tag by using the tags_subdir instead of the branches_subdir
804 specified during git svn init.
805 </p>
806 </dd>
808 -d
809 </dt>
811 --destination
812 </dt>
813 <dd>
814 <p>
817 tag) you wish to create in the SVN repository. The value of this
818 option must match one of the paths specified by a --branches (or
819 --tags) option. You can see these paths with the commands
820 </p>
825 </div></div>
826 <div class="paragraph"><p>where <name> is the name of the SVN repository as specified by the -R option to
828 </dd>
830 --username
831 </dt>
832 <dd>
833 <p>
834 Specify the SVN username to perform the commit as. This option overrides
836 </p>
837 </dd>
839 --commit-url
840 </dt>
841 <dd>
842 <p>
843 Use the specified URL to connect to the destination Subversion
844 repository. This is useful in cases where the source SVN
845 repository is read-only. This option overrides configuration
847 </p>
851 </div></div>
852 </dd>
853 </dl></div>
854 </dd>
857 </dt>
858 <dd>
859 <p>
860 Create a tag in the SVN repository. This is a shorthand for
862 </p>
863 </dd>
866 </dt>
867 <dd>
868 <p>
869 This should make it easy to look up svn log messages when svn
870 users refer to -r/--revision numbers.
871 </p>
872 <div class="paragraph"><p>The following features from ‘svn log’ are supported:</p></div>
876 </dt>
879 </dt>
880 <dd>
881 <p>
882 is supported, non-numeric args are not:
883 HEAD, NEXT, BASE, PREV, etc …
884 </p>
885 </dd>
887 -v
888 </dt>
890 --verbose
891 </dt>
892 <dd>
893 <p>
894 it’s not completely compatible with the --verbose
895 output in svn log, but reasonably close.
896 </p>
897 </dd>
900 </dt>
901 <dd>
902 <p>
903 is NOT the same as --max-count, doesn’t count
904 merged/excluded commits
905 </p>
906 </dd>
908 --incremental
909 </dt>
910 <dd>
911 <p>
912 supported
913 </p>
914 </dd>
915 </dl></div>
919 --show-commit
920 </dt>
921 <dd>
922 <p>
923 shows the git commit sha1, as well
924 </p>
925 </dd>
927 --oneline
928 </dt>
929 <dd>
930 <p>
931 our version of --pretty=oneline
932 </p>
933 </dd>
934 </dl></div>
936 <table><tr>
939 </td>
941 client converts the UTC time to the local time (or based on the TZ=
942 environment). This command has the same behaviour.</td>
943 </tr></table>
944 </div>
946 </dd>
949 </dt>
950 <dd>
951 <p>
952 Show what revision and author last modified each line of a file. The
953 output of this mode is format-compatible with the output of
955 local uncommitted changes in the working copy are ignored;
956 the version of the file in the HEAD revision is annotated. Unknown
958 </p>
961 --git-format
962 </dt>
963 <dd>
964 <p>
966 SVN revision numbers instead of git commit hashes. In this mode,
967 changes that haven’t been committed to SVN (including local
968 working-copy edits) are shown as revision 0.
969 </p>
970 </dd>
971 </dl></div>
972 </dd>
975 </dt>
976 <dd>
977 <p>
979 corresponding git commit hash (this can optionally be followed by a
980 tree-ish to specify which branch should be searched). When given a
981 tree-ish, returns the corresponding SVN revision number.
982 </p>
983 </dd>
986 </dt>
987 <dd>
988 <p>
990 Commit specified commit or tree objects to SVN. This relies on
991 your imported fetch data being up-to-date. This makes
992 absolutely no attempts to do patching when committing to SVN, it
993 simply overwrites files with those specified in the tree or
994 commit. All merging is assumed to have taken place
996 </p>
997 </dd>
1000 </dt>
1001 <dd>
1002 <p>
1003 Recursively finds the svn:ignore property on directories and
1004 creates matching .gitignore files. The resulting files are staged to
1005 be committed, but are not committed. Use -r/--revision to refer to a
1006 specific revision.
1007 </p>
1008 </dd>
1011 </dt>
1012 <dd>
1013 <p>
1014 Recursively finds and lists the svn:ignore property on
1015 directories. The output is suitable for appending to
1016 the $GIT_DIR/info/exclude file.
1017 </p>
1018 </dd>
1021 </dt>
1022 <dd>
1023 <p>
1024 Attempts to recreate empty directories that core git cannot track
1026 Empty directories are automatically recreated when using
1029 </p>
1030 </dd>
1033 </dt>
1034 <dd>
1035 <p>
1036 Commits the diff of two tree-ish arguments from the
1037 command-line. This command does not rely on being inside an <tt>git svn
1038 init</tt>-ed repository. This command takes three arguments, (a) the
1039 original tree to diff against, (b) the new tree result, (c) the
1040 URL of the target Subversion repository. The final argument
1044 </p>
1045 </dd>
1048 </dt>
1049 <dd>
1050 <p>
1051 Shows information about a file or directory similar to what
1053 argument. Use the --url option to output only the value of the
1055 </p>
1056 </dd>
1059 </dt>
1060 <dd>
1061 <p>
1062 Lists the properties stored in the Subversion repository about a
1063 given file or directory. Use -r/--revision to refer to a specific
1064 Subversion revision.
1065 </p>
1066 </dd>
1069 </dt>
1070 <dd>
1071 <p>
1072 Gets the Subversion property given as the first argument, for a
1073 file. A specific revision can be specified with -r/--revision.
1074 </p>
1075 </dd>
1078 </dt>
1079 <dd>
1080 <p>
1081 Shows the Subversion externals. Use -r/--revision to specify a
1082 specific revision.
1083 </p>
1084 </dd>
1087 </dt>
1088 <dd>
1089 <p>
1092 </p>
1093 </dd>
1096 </dt>
1097 <dd>
1098 <p>
1102 should not be necessary. However, if SVN permissions change,
1104 with "not found in commit" (file not previously visible) or
1105 "checksum mismatch" (missed a modification). If the problem
1106 file cannot be ignored forever (with --ignore-paths) the only
1108 </p>
1109 <div class="paragraph"><p>Only the rev_map and refs/remotes/git-svn are changed. Follow <em>reset</em>
1111 branches onto the new tree.</p></div>
1115 </dt>
1118 </dt>
1119 <dd>
1120 <p>
1121 Specify the most recent revision to keep. All later revisions
1122 are discarded.
1123 </p>
1124 </dd>
1126 -p
1127 </dt>
1129 --parent
1130 </dt>
1131 <dd>
1132 <p>
1133 Discard the specified revision as well, keeping the nearest
1134 parent instead.
1135 </p>
1136 </dd>
1138 Example:
1139 </dt>
1140 <dd>
1141 <p>
1143 </p>
1146 <pre><tt> r1---r2---r3 remotes/git-svn
1147 \
1148 A---B master</tt></pre>
1149 </div></div>
1151 be incomplete in the first place. Then:</p></div>
1154 git svn fetch</div>
1156 </div></div>
1159 <pre><tt> r1---r2'--r3' remotes/git-svn
1160 \
1161 r2---r3---A---B master</tt></pre>
1162 </div></div>
1169 </div></div>
1172 <pre><tt> r1---r2'--r3' remotes/git-svn
1173 \
1174 A'--B' master</tt></pre>
1175 </div></div>
1176 </dd>
1177 </dl></div>
1178 </dd>
1179 </dl></div>
1180 </div>
1185 --shared[=(false|true|umask|group|all|world|everybody)]
1186 </dt>
1189 </dt>
1190 <dd>
1191 <p>
1194 </p>
1195 </dd>
1198 </dt>
1201 </dt>
1202 <dd>
1203 <p>
1205 </p>
1207 to be supported. $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges),
1208 $NUMBER:HEAD, and BASE:$NUMBER are all supported.</p></div>
1210 but is generally not recommended because history will be skipped
1211 and lost.</p></div>
1212 </dd>
1214 -
1215 </dt>
1217 --stdin
1218 </dt>
1219 <dd>
1220 <p>
1222 </p>
1224 order. Only the leading sha1 is read from each line, so
1226 </dd>
1228 --rmdir
1229 </dt>
1230 <dd>
1231 <p>
1233 </p>
1235 behind. SVN can version empty directories, and they are not
1236 removed by default if there are no files left in them. git
1237 cannot version empty directories. Enabling this flag will make
1238 the commit to SVN act like git.</p></div>
1242 </div></div>
1243 </dd>
1245 -e
1246 </dt>
1248 --edit
1249 </dt>
1250 <dd>
1251 <p>
1253 </p>
1255 default for objects that are commits, and forced on when committing
1256 tree objects.</p></div>
1260 </div></div>
1261 </dd>
1264 </dt>
1266 --find-copies-harder
1267 </dt>
1268 <dd>
1269 <p>
1271 </p>
1276 config key: svn.findcopiesharder</div>
1278 </div></div>
1279 </dd>
1282 </dt>
1285 </dt>
1286 <dd>
1287 <p>
1289 </p>
1293 </div></div>
1296 will abort operation. The user will then have to add the
1298 after the authors-file is modified should continue operation.</p></div>
1302 </div></div>
1303 </dd>
1306 </dt>
1307 <dd>
1308 <p>
1309 If this option is specified, for each SVN committer name that
1310 does not exist in the authors file, the given file is executed
1311 with the committer name as the first argument. The program is
1312 expected to return a single line of the form "Name <email>",
1313 which will be treated as if included in the authors file.
1314 </p>
1315 </dd>
1317 -q
1318 </dt>
1320 --quiet
1321 </dt>
1322 <dd>
1323 <p>
1325 even less verbose.
1326 </p>
1327 </dd>
1330 </dt>
1333 </dt>
1334 <dd>
1335 <p>
1336 These should help keep disk usage sane for large fetches with
1337 many revisions.
1338 </p>
1340 to fetch before repacking. This defaults to repacking every
1345 config key: svn.repackflags</div>
1347 </div></div>
1348 </dd>
1350 -m
1351 </dt>
1353 --merge
1354 </dt>
1357 </dt>
1360 </dt>
1361 <dd>
1362 <p>
1364 </p>
1365 <div class="paragraph"><p>Passed directly to <em>git rebase</em> when using <em>dcommit</em> if a
1367 </dd>
1369 -n
1370 </dt>
1372 --dry-run
1373 </dt>
1374 <dd>
1375 <p>
1378 </p>
1379 <div class="paragraph"><p>For <em>dcommit</em>, print out the series of git arguments that would show
1380 which diffs would be committed to SVN.</p></div>
1381 <div class="paragraph"><p>For <em>rebase</em>, display the local branch associated with the upstream svn
1382 repository associated with the current branch and the URL of svn
1383 repository that will be fetched from.</p></div>
1384 <div class="paragraph"><p>For <em>branch</em> and <em>tag</em>, display the urls that will be used for copying when
1385 creating the branch or tag.</p></div>
1386 </dd>
1387 </dl></div>
1388 </div>
1394 </dt>
1397 </dt>
1398 <dd>
1399 <p>
1400 This sets GIT_SVN_ID (instead of using the environment). This
1401 allows the user to override the default refname to fetch from
1403 no longer require this switch as an argument.
1404 </p>
1405 </dd>
1408 </dt>
1411 </dt>
1412 <dd>
1413 <p>
1414 Specify the [svn-remote "<remote name>"] section to use,
1415 this allows SVN multiple repositories to be tracked.
1416 Default: "svn"
1417 </p>
1418 </dd>
1420 --follow-parent
1421 </dt>
1422 <dd>
1423 <p>
1424 This is especially helpful when we’re tracking a directory
1425 that has been moved around within the repository, or if we
1426 started tracking a branch and never tracked the trunk it was
1427 descended from. This feature is enabled by default, use
1428 --no-follow-parent to disable it.
1429 </p>
1433 </div></div>
1434 </dd>
1435 </dl></div>
1436 </div>
1441 svn.noMetadata
1442 </dt>
1445 </dt>
1446 <dd>
1447 <p>
1449 </p>
1450 <div class="paragraph"><p>This option can only be used for one-shot imports as <em>git svn</em>
1451 will not be able to fetch again without metadata. Additionally,
1453 be able to rebuild them.</p></div>
1456 option for (hopefully) obvious reasons.</p></div>
1457 <div class="paragraph"><p>This option is NOT recommended as it makes it difficult to track down
1458 old references to SVN revision numbers in existing documentation, bug
1459 reports and archives. If you plan to eventually migrate from SVN to git
1460 and are certain about dropping SVN history, consider
1462 reformatting of metadata for ease-of-reading and rewriting authorship
1464 </dd>
1466 svn.useSvmProps
1467 </dt>
1470 </dt>
1471 <dd>
1472 <p>
1474 mirrors created using SVN::Mirror (or svk) for metadata.
1475 </p>
1477 that the revision was created by SVN::Mirror (also used by SVK).
1478 The property contains a repository UUID and a revision. We want
1479 to make it look like we are mirroring the original URL, so
1480 introduce a helper function that returns the original identity
1481 URL and UUID, and use it when generating metadata in commit
1482 messages.</p></div>
1483 </dd>
1485 svn.useSvnsyncProps
1486 </dt>
1489 </dt>
1490 <dd>
1491 <p>
1492 Similar to the useSvmProps option; this is for users
1494 later.
1495 </p>
1496 </dd>
1499 </dt>
1500 <dd>
1501 <p>
1502 This allows users to create repositories from alternate
1504 server locally (accessing via file://) but wish to distribute
1505 the repository with a public http:// or svn:// URL in the
1506 metadata so users of it will see the public URL.
1507 </p>
1508 </dd>
1511 </dt>
1512 <dd>
1513 <p>
1514 Similar to the useSvmProps option; this is for users who need
1515 to remap the UUID manually. This may be useful in situations
1516 where the original UUID is not available via either useSvmProps
1517 or useSvnsyncProps.
1518 </p>
1519 </dd>
1521 svn.brokenSymlinkWorkaround
1522 </dt>
1523 <dd>
1524 <p>
1525 This disables potentially expensive checks to workaround
1526 broken symlinks checked into SVN by broken clients. Set this
1527 option to "false" if you track a SVN repository with many
1528 empty blobs that are not symlinks. This option may be changed
1531 be "true".
1532 </p>
1533 </dd>
1535 svn.pathnameencoding
1536 </dt>
1537 <dd>
1538 <p>
1539 This instructs git svn to recode pathnames to a given encoding.
1540 It can be used by windows users and by those who work in non-utf8
1541 locales to avoid corrupted file names with non-ASCII characters.
1542 Valid encodings are the ones supported by Perl’s Encode module.
1543 </p>
1544 </dd>
1545 </dl></div>
1546 <div class="paragraph"><p>Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps
1549 and these settings should never be changed once they are set.</p></div>
1552 for rewriteRoot and rewriteUUID which can be used together.</p></div>
1553 </div>
1556 <div class="paragraph"><p>Tracking and contributing to the trunk of a Subversion-managed project:</p></div>
1559 <pre><tt># Clone a repo (like git clone):
1560 git svn clone http://svn.example.com/project/trunk
1561 # Enter the newly cloned directory:
1562 cd trunk
1563 # You should be on master branch, double-check with 'git branch'
1564 git branch
1565 # Do some work and commit locally to git:
1566 git commit ...
1567 # Something is committed to SVN, rebase your local changes against the
1568 # latest changes in SVN:
1569 git svn rebase
1570 # Now commit your changes (that were committed previously using git) to SVN,
1571 # as well as automatically updating your working HEAD:
1572 git svn dcommit
1573 # Append svn:ignore settings to the default git exclude file:
1575 </div></div>
1577 (complete with a trunk, tags and branches):</p></div>
1580 <pre><tt># Clone a repo (like git clone):
1581 git svn clone http://svn.example.com/project -T trunk -b branches -t tags
1582 # View all branches and tags you have cloned:
1583 git branch -r
1584 # Create a new branch in SVN
1585 git svn branch waldo
1586 # Reset your master to trunk (or any other branch, replacing 'trunk'
1587 # with the appropriate name):
1588 git reset --hard remotes/trunk
1589 # You may only dcommit to one branch/tag/trunk at a time. The usage
1590 # of dcommit/rebase/show-ignore should be the same as above.</tt></pre>
1591 </div></div>
1593 (especially for large Subversion repositories). If multiple
1594 people (or one person with multiple machines) want to use
1600 <pre><tt># Do the initial import on a server
1601 ssh server "cd /pub && git svn clone http://svn.example.com/project
1602 # Clone locally - make sure the refs/remotes/ space matches the server
1603 mkdir project
1604 cd project
1605 git init
1606 git remote add origin server:/pub/project
1607 git config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
1608 git fetch
1609 # Prevent fetch/pull from remote git server in the future,
1610 # we only want to use git svn for future updates
1611 git config --remove-section remote.origin
1612 # Create a local branch from one of the branches just fetched
1613 git checkout -b master FETCH_HEAD
1614 # Initialize 'git svn' locally (be sure to use the same URL and -T/-b/-t options as were used on server)
1615 git svn init http://svn.example.com/project
1616 # Pull the latest changes from Subversion
1617 git svn rebase</tt></pre>
1618 </div></div>
1619 </div>
1622 <div class="paragraph"><p>Originally, <em>git svn</em> recommended that the <em>remotes/git-svn</em> branch be
1623 pulled or merged from. This is because the author favored
1624 <tt>git svn set-tree B</tt> to commit a single head rather than the
1625 <tt>git svn set-tree A..B</tt> notation to commit multiple commits.</p></div>
1626 <div class="paragraph"><p>If you use <tt>git svn set-tree A..B</tt> to commit several diffs and you do
1627 not have the latest remotes/git-svn merged into my-branch, you should
1628 use <tt>git svn rebase</tt> to update your work branch instead of <tt>git pull</tt> or
1629 <tt>git merge</tt>. <tt>pull</tt>/<tt>merge</tt> can cause non-linear history to be flattened
1630 when committing into SVN, which can lead to merge commits reversing
1631 previous commits in SVN.</p></div>
1632 </div>
1635 <div class="paragraph"><p>Merge tracking in Subversion is lacking and doing branched development
1636 with Subversion can be cumbersome as a result. While <em>git svn</em> can track
1637 copy history (including branches and tags) for repositories adopting a
1638 standard layout, it cannot yet represent merge history that happened
1639 inside git back upstream to SVN users. Therefore it is advised that
1640 users keep history as linear as possible inside git to ease
1641 compatibility with SVN (see the CAVEATS section below).</p></div>
1642 </div>
1645 <div class="paragraph"><p>For the sake of simplicity and interoperating with a less-capable system
1646 (SVN), it is recommended that all <em>git svn</em> users clone, fetch and dcommit
1647 directly from the SVN server, and avoid all <em>git clone</em>/<em>pull</em>/<em>merge</em>/<em>push</em>
1648 operations between git repositories and branches. The recommended
1649 method of exchanging code between git branches and users is
1650 <em>git format-patch</em> and <em>git am</em>, or just 'dcommit’ing to the SVN repository.</p></div>
1651 <div class="paragraph"><p>Running <em>git merge</em> or <em>git pull</em> is NOT recommended on a branch you
1652 plan to <em>dcommit</em> from. Subversion does not represent merges in any
1653 reasonable or useful fashion; so users using Subversion cannot see any
1654 merges you’ve made. Furthermore, if you merge or pull from a git branch
1655 that is a mirror of an SVN branch, <em>dcommit</em> may commit to the wrong
1656 branch.</p></div>
1657 <div class="paragraph"><p>If you do merge, note the following rule: <em>git svn dcommit</em> will
1658 attempt to commit on top of the SVN commit named in</p></div>
1661 <pre><tt>git log --grep=^git-svn-id: --first-parent -1</tt></pre>
1662 </div></div>
1663 <div class="paragraph"><p>You <em>must</em> therefore ensure that the most recent commit of the branch
1664 you want to dcommit to is the <em>first</em> parent of the merge. Chaos will
1665 ensue otherwise, especially if the first parent is an older commit on
1666 the same SVN branch.</p></div>
1667 <div class="paragraph"><p><em>git clone</em> does not clone branches under the refs/remotes/ hierarchy or
1668 any <em>git svn</em> metadata, or config. So repositories created and managed with
1669 using <em>git svn</em> should use <em>rsync</em> for cloning, if cloning is to be done
1670 at all.</p></div>
1671 <div class="paragraph"><p>Since <em>dcommit</em> uses rebase internally, any git branches you <em>git push</em> to
1672 before <em>dcommit</em> on will require forcing an overwrite of the existing ref
1673 on the remote repository. This is generally considered bad practice,
1675 <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
1676 already dcommitted. It is considered bad practice to --amend commits
1677 you’ve already pushed to a remote repository for other users, and
1678 dcommit with SVN is analogous to that.</p></div>
1679 <div class="paragraph"><p>When using multiple --branches or --tags, <em>git svn</em> does not automatically
1680 handle name collisions (for example, if two branches from different paths have
1681 the same name, or if a branch and a tag have the same name). In these cases,
1682 use <em>init</em> to set up your git repository then, before your first <em>fetch</em>, edit
1683 the .git/config file so that the branches and tags are associated with
1684 different name spaces. For example:</p></div>
1687 <pre><tt>branches = stable/*:refs/remotes/svn/stable/*
1688 branches = debug/*:refs/remotes/svn/debug/*</tt></pre>
1689 </div></div>
1690 </div>
1694 properties are logged to $GIT_DIR/svn/<refname>/unhandled.log</p></div>
1696 tracked when committing to SVN. I do not plan on adding support for
1697 this as it’s quite difficult and time-consuming to get working for all
1698 the possible corner cases (git doesn’t do it, either). Committing
1699 renamed and copied files are fully supported if they’re similar enough
1700 for git to detect them.</p></div>
1701 </div>
1704 <div class="paragraph"><p><em>git svn</em> stores [svn-remote] configuration information in the
1705 repository .git/config file. It is similar the core git
1706 [remote] sections except <em>fetch</em> keys do not accept glob
1707 arguments; but they are instead handled by the <em>branches</em>
1708 and <em>tags</em> keys. Since some SVN repositories are oddly
1709 configured with multiple projects glob expansions such those
1710 listed below are allowed:</p></div>
1714 url = http://server.org/svn
1715 fetch = trunk/project-a:refs/remotes/project-a/trunk
1716 branches = branches/*/project-a:refs/remotes/project-a/branches/*
1717 tags = tags/*/project-a:refs/remotes/project-a/tags/*</tt></pre>
1718 </div></div>
1719 <div class="paragraph"><p>Keep in mind that the <em>*</em> (asterisk) wildcard of the local ref
1720 (right of the <em>:</em>) <strong>must</strong> be the farthest right path component;
1721 however the remote wildcard may be anywhere as long as it’s an
1722 independent path component (surrounded by <em>/</em> or EOL). This
1723 type of configuration is not automatically created by <em>init</em> and
1724 should be manually entered with a text-editor or using <em>git config</em>.</p></div>
1726 comma-separated list of names within braces. For example:</p></div>
1730 url = http://server.org/svn
1731 fetch = trunk/src:refs/remotes/trunk
1732 branches = branches/{red,green}/src:refs/remotes/branches/*
1733 tags = tags/{1.0,2.0}/src:refs/remotes/tags/*</tt></pre>
1734 </div></div>
1735 <div class="paragraph"><p>Note that git-svn keeps track of the highest revision in which a branch
1736 or tag has appeared. If the subset of branches or tags is changed after
1737 fetching, then .git/svn/.metadata must be manually edited to remove (or
1738 reset) branches-maxRev and/or tags-maxRev as appropriate.</p></div>
1739 </div>
1743 </div>
1747 </div>
1750 Last updated 2011-03-15 23:30:14 UTC
1751 </div>
1752 </div>
1753 </body>
1754 </html>