2006-02-16 09:24:16 +00:00
|
|
|
git-svn(1)
|
|
|
|
==========
|
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
2013-01-21 19:17:53 +00:00
|
|
|
git-svn - Bidirectional operation between a Subversion repository and Git
|
2006-02-16 09:24:16 +00:00
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2011-07-02 02:38:26 +00:00
|
|
|
[verse]
|
2018-05-24 20:11:39 +00:00
|
|
|
'git svn' <command> [<options>] [<arguments>]
|
2006-02-16 09:24:16 +00:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2013-01-21 19:17:53 +00:00
|
|
|
'git svn' is a simple conduit for changesets between Subversion and Git.
|
|
|
|
It provides a bidirectional flow of changes between a Subversion and a Git
|
2008-08-05 16:12:05 +00:00
|
|
|
repository.
|
2006-02-16 09:24:16 +00:00
|
|
|
|
2009-07-07 20:22:19 +00:00
|
|
|
'git svn' can track a standard Subversion repository,
|
2009-06-26 20:49:19 +00:00
|
|
|
following the common "trunk/branches/tags" layout, with the --stdlayout option.
|
|
|
|
It can also follow branches and tags in any layout with the -T/-t/-b options
|
|
|
|
(see options to 'init' below, and also the 'clone' command).
|
2006-02-16 09:24:16 +00:00
|
|
|
|
2013-01-21 19:17:53 +00:00
|
|
|
Once tracking a Subversion repository (with any of the above methods), the Git
|
2008-07-30 01:16:01 +00:00
|
|
|
repository can be updated from Subversion by the 'fetch' command and
|
2013-01-21 19:17:53 +00:00
|
|
|
Subversion updated from Git by the 'dcommit' command.
|
2006-02-16 09:24:16 +00:00
|
|
|
|
|
|
|
COMMANDS
|
|
|
|
--------
|
2006-08-25 01:07:46 +00:00
|
|
|
|
|
|
|
'init'::
|
2013-01-21 19:17:53 +00:00
|
|
|
Initializes an empty Git repository with additional
|
2009-07-07 20:22:19 +00:00
|
|
|
metadata directories for 'git svn'. The Subversion URL
|
2007-02-15 03:34:56 +00:00
|
|
|
may be specified as a command-line argument, or as full
|
|
|
|
URL arguments to -T/-t/-b. Optionally, the target
|
|
|
|
directory to operate on can be specified as a second
|
|
|
|
argument. Normally this command initializes the current
|
|
|
|
directory.
|
2006-02-16 09:24:16 +00:00
|
|
|
|
2007-05-04 07:03:22 +00:00
|
|
|
-T<trunk_subdir>;;
|
|
|
|
--trunk=<trunk_subdir>;;
|
|
|
|
-t<tags_subdir>;;
|
|
|
|
--tags=<tags_subdir>;;
|
|
|
|
-b<branches_subdir>;;
|
|
|
|
--branches=<branches_subdir>;;
|
2007-07-14 09:25:28 +00:00
|
|
|
-s;;
|
|
|
|
--stdlayout;;
|
2007-02-15 03:34:56 +00:00
|
|
|
These are optional command-line options for init. Each of
|
|
|
|
these flags can point to a relative repository path
|
2009-06-26 20:49:19 +00:00
|
|
|
(--tags=project/tags) or a full url
|
|
|
|
(--tags=https://foo.org/project/tags).
|
|
|
|
You can specify more than one --tags and/or --branches options, in case
|
|
|
|
your Subversion repository places tags or branches under multiple paths.
|
|
|
|
The option --stdlayout is
|
2007-07-14 09:25:28 +00:00
|
|
|
a shorthand way of setting trunk,tags,branches as the relative paths,
|
|
|
|
which is the Subversion default. If any of the other options are given
|
|
|
|
as well, they take precedence.
|
2007-05-04 07:03:22 +00:00
|
|
|
--no-metadata;;
|
2007-02-18 10:34:09 +00:00
|
|
|
Set the 'noMetadata' option in the [svn-remote] config.
|
2010-08-21 18:52:14 +00:00
|
|
|
This option is not recommended, please read the 'svn.noMetadata'
|
|
|
|
section of this manpage before using this option.
|
2007-05-04 07:03:22 +00:00
|
|
|
--use-svm-props;;
|
2007-02-18 10:34:09 +00:00
|
|
|
Set the 'useSvmProps' option in the [svn-remote] config.
|
2007-05-04 07:03:22 +00:00
|
|
|
--use-svnsync-props;;
|
2007-02-18 10:34:09 +00:00
|
|
|
Set the 'useSvnsyncProps' option in the [svn-remote] config.
|
2007-05-04 07:03:22 +00:00
|
|
|
--rewrite-root=<URL>;;
|
2007-02-18 10:34:09 +00:00
|
|
|
Set the 'rewriteRoot' option in the [svn-remote] config.
|
2010-01-23 08:30:00 +00:00
|
|
|
--rewrite-uuid=<UUID>;;
|
|
|
|
Set the 'rewriteUUID' option in the [svn-remote] config.
|
2011-02-17 07:48:06 +00:00
|
|
|
--username=<user>;;
|
2007-02-22 23:32:30 +00:00
|
|
|
For transports that SVN handles authentication for (http,
|
|
|
|
https, and plain svn), specify the username. For other
|
2015-05-13 05:06:21 +00:00
|
|
|
transports (e.g. `svn+ssh://`), you must include the username in
|
|
|
|
the URL, e.g. `svn+ssh://foo@svn.bar.com/project`
|
2007-05-04 07:03:22 +00:00
|
|
|
--prefix=<prefix>;;
|
2007-02-15 03:34:56 +00:00
|
|
|
This allows one to specify a prefix which is prepended
|
|
|
|
to the names of remotes if trunk/branches/tags are
|
|
|
|
specified. The prefix does not automatically include a
|
|
|
|
trailing slash, so be sure you include one in the
|
2007-06-19 16:47:41 +00:00
|
|
|
argument if that is what you want. If --branches/-b is
|
|
|
|
specified, the prefix must include a trailing slash.
|
Documentation/git-svn: Promote the use of --prefix in docs + examples
Currently, the git-svn defaults to using an empty prefix, which ends
up placing the SVN-tracking refs directly in refs/remotes/*. This
placement runs counter to Git's convention of placing remote-tracking
branches in refs/remotes/$remote/*.
Furthermore, combining git-svn with "regular" Git remotes run the risk
of clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
At this time, the user is better off using the --prefix=foo/ (the
trailing slash is important) to git svn init/clone, to cause the
SVN-tracking refs to be placed at refs/remotes/foo/* instead of
refs/remotes/*. This patch updates the documentation to encourage
use of --prefix.
This is also in preparation for changing the default value of --prefix
at some point in the future.
Cc: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:05 +00:00
|
|
|
Setting a prefix (with a trailing slash) is strongly
|
|
|
|
encouraged in any case, as your SVN-tracking refs will
|
|
|
|
then be located at "refs/remotes/$prefix/*", which is
|
|
|
|
compatible with Git's own remote-tracking ref layout
|
|
|
|
(refs/remotes/$remote/*). Setting a prefix is also useful
|
|
|
|
if you wish to track multiple projects that share a common
|
|
|
|
repository.
|
Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
git-svn by default puts its Subversion-tracking refs directly in
refs/remotes/*. This runs counter to Git's convention of using
refs/remotes/$remote/* for storing remote-tracking branches.
Furthermore, combining git-svn with regular git remotes run the risk of
clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
The existing workaround for this is to supply the --prefix=quux/ to
git svn init/clone, so that git-svn's tracking branches end up in
refs/remotes/quux/* instead of refs/remotes/*. However, encouraging
users to specify --prefix to work around a design flaw in git-svn is
suboptimal, and not a long term solution to the problem. Instead,
git-svn should default to use a non-empty prefix that saves
unsuspecting users from the inconveniences described above.
This patch will only affect newly created git-svn setups, as the
--prefix option only applies to git svn init (and git svn clone).
Existing git-svn setups will continue with their existing (lack of)
prefix. Also, if anyone somehow prefers git-svn's old layout, they
can recreate that by explicitly passing an empty prefix (--prefix "")
on the git svn init/clone command line.
The patch changes the default value for --prefix from "" to "origin/",
updates the git-svn manual page, and fixes the fallout in the git-svn
testcases.
(Note that this patch might be easier to review using the --word-diff
and --word-diff-regex=. diff options.)
[ew: squashed description of <= 1.9 behavior into manpage]
Suggested-by: Thomas Ferris Nicolaisen <tfnico@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:07 +00:00
|
|
|
By default, the prefix is set to 'origin/'.
|
2013-10-11 12:57:06 +00:00
|
|
|
+
|
Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given
git-svn by default puts its Subversion-tracking refs directly in
refs/remotes/*. This runs counter to Git's convention of using
refs/remotes/$remote/* for storing remote-tracking branches.
Furthermore, combining git-svn with regular git remotes run the risk of
clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
The existing workaround for this is to supply the --prefix=quux/ to
git svn init/clone, so that git-svn's tracking branches end up in
refs/remotes/quux/* instead of refs/remotes/*. However, encouraging
users to specify --prefix to work around a design flaw in git-svn is
suboptimal, and not a long term solution to the problem. Instead,
git-svn should default to use a non-empty prefix that saves
unsuspecting users from the inconveniences described above.
This patch will only affect newly created git-svn setups, as the
--prefix option only applies to git svn init (and git svn clone).
Existing git-svn setups will continue with their existing (lack of)
prefix. Also, if anyone somehow prefers git-svn's old layout, they
can recreate that by explicitly passing an empty prefix (--prefix "")
on the git svn init/clone command line.
The patch changes the default value for --prefix from "" to "origin/",
updates the git-svn manual page, and fixes the fallout in the git-svn
testcases.
(Note that this patch might be easier to review using the --word-diff
and --word-diff-regex=. diff options.)
[ew: squashed description of <= 1.9 behavior into manpage]
Suggested-by: Thomas Ferris Nicolaisen <tfnico@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:07 +00:00
|
|
|
NOTE: Before Git v2.0, the default prefix was "" (no prefix). This
|
|
|
|
meant that SVN-tracking refs were put at "refs/remotes/*", which is
|
|
|
|
incompatible with how Git's own remote-tracking refs are organized.
|
2014-04-22 11:16:22 +00:00
|
|
|
If you still want the old default, you can get it by passing
|
|
|
|
`--prefix ""` on the command line (`--prefix=""` may not work if
|
|
|
|
your Perl's Getopt::Long is < v2.37).
|
2013-10-11 12:57:06 +00:00
|
|
|
|
2017-06-07 18:32:14 +00:00
|
|
|
--ignore-refs=<regex>;;
|
|
|
|
When passed to 'init' or 'clone' this regular expression will
|
|
|
|
be preserved as a config key. See 'fetch' for a description
|
|
|
|
of `--ignore-refs`.
|
2009-04-11 17:46:18 +00:00
|
|
|
--ignore-paths=<regex>;;
|
|
|
|
When passed to 'init' or 'clone' this regular expression will
|
|
|
|
be preserved as a config key. See 'fetch' for a description
|
2016-06-28 11:40:11 +00:00
|
|
|
of `--ignore-paths`.
|
2013-05-03 23:10:18 +00:00
|
|
|
--include-paths=<regex>;;
|
|
|
|
When passed to 'init' or 'clone' this regular expression will
|
|
|
|
be preserved as a config key. See 'fetch' for a description
|
2016-06-28 11:40:11 +00:00
|
|
|
of `--include-paths`.
|
2009-07-25 07:00:50 +00:00
|
|
|
--no-minimize-url;;
|
|
|
|
When tracking multiple directories (using --stdlayout,
|
|
|
|
--branches, or --tags options), git svn will attempt to connect
|
|
|
|
to the root (or highest allowed level) of the Subversion
|
|
|
|
repository. This default allows better tracking of history if
|
|
|
|
entire projects are moved within a repository, but may cause
|
|
|
|
issues on repositories where read access restrictions are in
|
2016-06-28 11:40:11 +00:00
|
|
|
place. Passing `--no-minimize-url` will allow git svn to
|
2009-07-25 07:00:50 +00:00
|
|
|
accept URLs as-is without attempting to connect to a higher
|
|
|
|
level directory. This option is off by default when only
|
|
|
|
one URL/branch is tracked (it would do little good).
|
2006-05-05 19:35:39 +00:00
|
|
|
|
2007-02-15 03:34:56 +00:00
|
|
|
'fetch'::
|
|
|
|
Fetch unfetched revisions from the Subversion remote we are
|
|
|
|
tracking. The name of the [svn-remote "..."] section in the
|
2013-09-29 23:45:59 +00:00
|
|
|
$GIT_DIR/config file may be specified as an optional
|
|
|
|
command-line argument.
|
2013-09-29 23:46:00 +00:00
|
|
|
+
|
|
|
|
This automatically updates the rev_map if needed (see
|
2019-03-06 06:30:17 +00:00
|
|
|
'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details).
|
2006-02-27 19:04:02 +00:00
|
|
|
|
2009-01-18 04:10:14 +00:00
|
|
|
--localtime;;
|
2013-11-09 00:48:52 +00:00
|
|
|
Store Git commit times in the local time zone instead of UTC. This
|
2009-07-07 20:22:19 +00:00
|
|
|
makes 'git log' (even without --date=local) show the same times
|
2013-11-09 00:48:52 +00:00
|
|
|
that `svn log` would in the local time zone.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-01-18 04:10:14 +00:00
|
|
|
This doesn't interfere with interoperating with the Subversion
|
|
|
|
repository you cloned from, but if you wish for your local Git
|
|
|
|
repository to be able to interoperate with someone else's local Git
|
|
|
|
repository, either don't use this option or you should both use it in
|
2013-11-09 00:48:52 +00:00
|
|
|
the same local time zone.
|
2009-01-18 04:10:14 +00:00
|
|
|
|
2009-08-14 08:11:58 +00:00
|
|
|
--parent;;
|
|
|
|
Fetch only from the SVN parent of the current HEAD.
|
|
|
|
|
2017-06-07 18:32:14 +00:00
|
|
|
--ignore-refs=<regex>;;
|
|
|
|
Ignore refs for branches or tags matching the Perl regular
|
|
|
|
expression. A "negative look-ahead assertion" like
|
|
|
|
`^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$`
|
|
|
|
can be used to allow only certain refs.
|
|
|
|
+
|
|
|
|
[verse]
|
|
|
|
config key: svn-remote.<name>.ignore-refs
|
|
|
|
+
|
|
|
|
If the ignore-refs configuration key is set, and the command-line
|
|
|
|
option is also given, both regular expressions will be used.
|
|
|
|
|
2009-01-25 22:21:41 +00:00
|
|
|
--ignore-paths=<regex>;;
|
2009-04-11 17:46:17 +00:00
|
|
|
This allows one to specify a Perl regular expression that will
|
2009-01-25 22:21:41 +00:00
|
|
|
cause skipping of all matching paths from checkout from SVN.
|
2016-06-28 11:40:11 +00:00
|
|
|
The `--ignore-paths` option should match for every 'fetch'
|
2009-04-11 17:46:17 +00:00
|
|
|
(including automatic fetches due to 'clone', 'dcommit',
|
|
|
|
'rebase', etc) on a given repository.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
|
|
|
[verse]
|
2009-04-11 17:46:17 +00:00
|
|
|
config key: svn-remote.<name>.ignore-paths
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2014-05-21 18:52:26 +00:00
|
|
|
If the ignore-paths configuration key is set, and the command-line
|
|
|
|
option is also given, both regular expressions will be used.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-04-11 17:46:17 +00:00
|
|
|
Examples:
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
|
|
|
--
|
|
|
|
Skip "doc*" directory for every fetch;;
|
|
|
|
+
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
--ignore-paths="^doc"
|
|
|
|
------------------------------------------------------------------------
|
2009-04-11 17:46:17 +00:00
|
|
|
|
2009-07-07 20:22:20 +00:00
|
|
|
Skip "branches" and "tags" of first level directories;;
|
|
|
|
+
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
--ignore-paths="^[^/]+/(?:branches|tags)"
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
--
|
2009-01-25 22:21:41 +00:00
|
|
|
|
2013-05-03 23:10:18 +00:00
|
|
|
--include-paths=<regex>;;
|
|
|
|
This allows one to specify a Perl regular expression that will
|
|
|
|
cause the inclusion of only matching paths from checkout from SVN.
|
2016-06-28 11:40:11 +00:00
|
|
|
The `--include-paths` option should match for every 'fetch'
|
2013-05-03 23:10:18 +00:00
|
|
|
(including automatic fetches due to 'clone', 'dcommit',
|
2016-06-28 11:40:11 +00:00
|
|
|
'rebase', etc) on a given repository. `--ignore-paths` takes
|
|
|
|
precedence over `--include-paths`.
|
2015-08-24 00:23:45 +00:00
|
|
|
+
|
|
|
|
[verse]
|
|
|
|
config key: svn-remote.<name>.include-paths
|
2013-05-03 23:10:18 +00:00
|
|
|
|
2012-10-23 10:33:26 +00:00
|
|
|
--log-window-size=<n>;;
|
2013-10-21 19:36:06 +00:00
|
|
|
Fetch <n> log entries per request when scanning Subversion history.
|
|
|
|
The default is 100. For very large Subversion repositories, larger
|
|
|
|
values may be needed for 'clone'/'fetch' to complete in reasonable
|
|
|
|
time. But overly large values may lead to higher memory usage and
|
|
|
|
request timeouts.
|
2012-10-23 10:33:26 +00:00
|
|
|
|
2007-02-18 10:10:51 +00:00
|
|
|
'clone'::
|
|
|
|
Runs 'init' and 'fetch'. It will automatically create a
|
|
|
|
directory based on the basename of the URL passed to it;
|
|
|
|
or if a second argument is passed; it will create a directory
|
|
|
|
and work within that. It accepts all arguments that the
|
|
|
|
'init' and 'fetch' commands accept; with the exception of
|
2016-06-28 11:40:11 +00:00
|
|
|
`--fetch-all` and `--parent`. After a repository is cloned,
|
2009-07-07 20:22:22 +00:00
|
|
|
the 'fetch' command will be able to update revisions without
|
|
|
|
affecting the working tree; and the 'rebase' command will be
|
|
|
|
able to update the working tree with the latest changes.
|
2007-02-18 10:10:51 +00:00
|
|
|
|
2011-07-20 22:37:26 +00:00
|
|
|
--preserve-empty-dirs;;
|
|
|
|
Create a placeholder file in the local Git repository for each
|
|
|
|
empty directory fetched from Subversion. This includes directories
|
|
|
|
that become empty by removing all entries in the Subversion
|
|
|
|
repository (but not the directory itself). The placeholder files
|
|
|
|
are also tracked and removed when no longer necessary.
|
|
|
|
|
|
|
|
--placeholder-filename=<filename>;;
|
|
|
|
Set the name of placeholder files created by --preserve-empty-dirs.
|
|
|
|
Default: ".gitignore"
|
|
|
|
|
2007-02-18 10:10:51 +00:00
|
|
|
'rebase'::
|
|
|
|
This fetches revisions from the SVN parent of the current HEAD
|
|
|
|
and rebases the current (uncommitted to SVN) work against it.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-07-07 20:22:19 +00:00
|
|
|
This works similarly to `svn update` or 'git pull' except that
|
|
|
|
it preserves linear history with 'git rebase' instead of
|
|
|
|
'git merge' for ease of dcommitting with 'git svn'.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-07-07 20:22:19 +00:00
|
|
|
This accepts all options that 'git svn fetch' and 'git rebase'
|
2016-06-28 11:40:11 +00:00
|
|
|
accept. However, `--fetch-all` only fetches from the current
|
2007-03-01 19:41:17 +00:00
|
|
|
[svn-remote], and not all [svn-remote] definitions.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-07-07 20:22:19 +00:00
|
|
|
Like 'git rebase'; this requires that the working tree be clean
|
2007-03-01 19:41:17 +00:00
|
|
|
and have no uncommitted changes.
|
2013-09-29 23:46:00 +00:00
|
|
|
+
|
|
|
|
This automatically updates the rev_map if needed (see
|
2019-03-06 06:30:17 +00:00
|
|
|
'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details).
|
2007-05-04 07:03:22 +00:00
|
|
|
|
2007-03-13 18:40:36 +00:00
|
|
|
-l;;
|
|
|
|
--local;;
|
2009-07-07 20:22:19 +00:00
|
|
|
Do not fetch remotely; only run 'git rebase' against the
|
2007-03-13 18:40:36 +00:00
|
|
|
last fetched commit from the upstream SVN.
|
2007-02-18 10:10:51 +00:00
|
|
|
|
2006-08-26 07:01:23 +00:00
|
|
|
'dcommit'::
|
2012-05-17 03:20:43 +00:00
|
|
|
Commit each diff from the current branch directly to the SVN
|
2006-08-26 07:01:23 +00:00
|
|
|
repository, and then rebase or reset (depending on whether or
|
2007-01-07 01:53:40 +00:00
|
|
|
not there is a diff between SVN and head). This will create
|
2013-01-21 19:17:53 +00:00
|
|
|
a revision in SVN for each commit in Git.
|
2012-05-17 03:20:43 +00:00
|
|
|
+
|
2013-01-21 19:17:53 +00:00
|
|
|
When an optional Git branch name (or a Git commit object name)
|
2012-05-17 03:20:43 +00:00
|
|
|
is specified as an argument, the subcommand works on the specified
|
|
|
|
branch, not on the current branch.
|
|
|
|
+
|
|
|
|
Use of 'dcommit' is preferred to 'set-tree' (below).
|
2007-05-03 05:51:35 +00:00
|
|
|
+
|
|
|
|
--no-rebase;;
|
|
|
|
After committing, do not rebase or reset.
|
2008-08-07 09:06:16 +00:00
|
|
|
--commit-url <URL>;;
|
|
|
|
Commit to this SVN URL (the full path). This is intended to
|
2009-07-07 20:22:19 +00:00
|
|
|
allow existing 'git svn' repositories created with one transport
|
2008-08-07 09:06:16 +00:00
|
|
|
method (e.g. `svn://` or `http://` for anonymous read) to be
|
|
|
|
reused if a user is later given access to an alternate transport
|
|
|
|
method (e.g. `svn+ssh://` or `https://`) for commit.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
|
|
|
[verse]
|
2009-02-23 11:02:53 +00:00
|
|
|
config key: svn-remote.<name>.commiturl
|
|
|
|
config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2014-10-09 22:49:59 +00:00
|
|
|
Note that the SVN URL of the commiturl config key includes the SVN branch.
|
|
|
|
If you rather want to set the commit URL for an entire SVN repository use
|
|
|
|
svn-remote.<name>.pushurl instead.
|
|
|
|
+
|
2009-07-07 20:22:20 +00:00
|
|
|
Using this option for any other purpose (don't ask) is very strongly
|
|
|
|
discouraged.
|
2006-08-26 07:01:23 +00:00
|
|
|
|
2011-04-19 12:24:27 +00:00
|
|
|
--mergeinfo=<mergeinfo>;;
|
|
|
|
Add the given merge information during the dcommit
|
|
|
|
(e.g. `--mergeinfo="/branches/foo:1-10"`). All svn server versions can
|
|
|
|
store this information (as a property), and svn clients starting from
|
2011-08-31 16:48:39 +00:00
|
|
|
version 1.5 can make use of it. To specify merge information from multiple
|
|
|
|
branches, use a single space character between the branches
|
|
|
|
(`--mergeinfo="/branches/foo:1-10 /branches/bar:3,5-6,8"`)
|
2011-09-07 17:36:05 +00:00
|
|
|
+
|
|
|
|
[verse]
|
|
|
|
config key: svn.pushmergeinfo
|
|
|
|
+
|
|
|
|
This option will cause git-svn to attempt to automatically populate the
|
|
|
|
svn:mergeinfo property in the SVN repository when possible. Currently, this can
|
|
|
|
only be done when dcommitting non-fast-forward merges where all parents but the
|
|
|
|
first have already been pushed into SVN.
|
2011-04-19 12:24:27 +00:00
|
|
|
|
2011-09-16 21:02:01 +00:00
|
|
|
--interactive;;
|
|
|
|
Ask the user to confirm that a patch set should actually be sent to SVN.
|
|
|
|
For each patch, one may answer "yes" (accept this patch), "no" (discard this
|
|
|
|
patch), "all" (accept all patches), or "quit".
|
2015-05-13 04:58:16 +00:00
|
|
|
+
|
|
|
|
'git svn dcommit' returns immediately if answer is "no" or "quit", without
|
|
|
|
committing anything to SVN.
|
2011-09-16 21:02:01 +00:00
|
|
|
|
2008-10-05 02:35:17 +00:00
|
|
|
'branch'::
|
|
|
|
Create a branch in the SVN repository.
|
|
|
|
|
|
|
|
-m;;
|
|
|
|
--message;;
|
|
|
|
Allows to specify the commit message.
|
|
|
|
|
|
|
|
-t;;
|
|
|
|
--tag;;
|
|
|
|
Create a tag by using the tags_subdir instead of the branches_subdir
|
|
|
|
specified during git svn init.
|
|
|
|
|
2011-12-20 01:24:30 +00:00
|
|
|
-d<path>;;
|
|
|
|
--destination=<path>;;
|
|
|
|
|
2009-06-26 20:49:19 +00:00
|
|
|
If more than one --branches (or --tags) option was given to the 'init'
|
|
|
|
or 'clone' command, you must provide the location of the branch (or
|
2011-12-20 01:24:30 +00:00
|
|
|
tag) you wish to create in the SVN repository. <path> specifies which
|
|
|
|
path to use to create the branch or tag and should match the pattern
|
|
|
|
on the left-hand side of one of the configured branches or tags
|
|
|
|
refspecs. You can see these refspecs with the commands
|
2009-06-26 20:49:19 +00:00
|
|
|
+
|
|
|
|
git config --get-all svn-remote.<name>.branches
|
|
|
|
git config --get-all svn-remote.<name>.tags
|
|
|
|
+
|
|
|
|
where <name> is the name of the SVN repository as specified by the -R option to
|
|
|
|
'init' (or "svn" by default).
|
|
|
|
|
2010-01-11 16:22:27 +00:00
|
|
|
--username;;
|
|
|
|
Specify the SVN username to perform the commit as. This option overrides
|
2010-05-07 19:50:03 +00:00
|
|
|
the 'username' configuration property.
|
2010-01-11 16:22:27 +00:00
|
|
|
|
|
|
|
--commit-url;;
|
|
|
|
Use the specified URL to connect to the destination Subversion
|
|
|
|
repository. This is useful in cases where the source SVN
|
|
|
|
repository is read-only. This option overrides configuration
|
|
|
|
property 'commiturl'.
|
|
|
|
+
|
|
|
|
git config --get-all svn-remote.<name>.commiturl
|
|
|
|
+
|
|
|
|
|
2013-05-15 20:14:43 +00:00
|
|
|
--parents;;
|
|
|
|
Create parent folders. This parameter is equivalent to the parameter
|
|
|
|
--parents on svn cp commands and is useful for non-standard repository
|
|
|
|
layouts.
|
|
|
|
|
2008-10-05 02:35:17 +00:00
|
|
|
'tag'::
|
|
|
|
Create a tag in the SVN repository. This is a shorthand for
|
|
|
|
'branch -t'.
|
|
|
|
|
2006-10-11 21:53:35 +00:00
|
|
|
'log'::
|
|
|
|
This should make it easy to look up svn log messages when svn
|
|
|
|
users refer to -r/--revision numbers.
|
2007-03-01 19:41:17 +00:00
|
|
|
+
|
|
|
|
The following features from `svn log' are supported:
|
|
|
|
+
|
|
|
|
--
|
2009-07-07 20:22:20 +00:00
|
|
|
-r <n>[:<n>];;
|
|
|
|
--revision=<n>[:<n>];;
|
2007-03-01 19:41:17 +00:00
|
|
|
is supported, non-numeric args are not:
|
|
|
|
HEAD, NEXT, BASE, PREV, etc ...
|
2009-07-07 20:22:20 +00:00
|
|
|
-v;;
|
|
|
|
--verbose;;
|
2007-03-01 19:41:17 +00:00
|
|
|
it's not completely compatible with the --verbose
|
|
|
|
output in svn log, but reasonably close.
|
|
|
|
--limit=<n>;;
|
|
|
|
is NOT the same as --max-count, doesn't count
|
|
|
|
merged/excluded commits
|
|
|
|
--incremental;;
|
|
|
|
supported
|
|
|
|
--
|
|
|
|
+
|
|
|
|
New features:
|
|
|
|
+
|
|
|
|
--
|
|
|
|
--show-commit;;
|
2013-01-21 19:17:53 +00:00
|
|
|
shows the Git commit sha1, as well
|
2007-03-01 19:41:17 +00:00
|
|
|
--oneline;;
|
|
|
|
our version of --pretty=oneline
|
|
|
|
--
|
|
|
|
+
|
2008-02-27 13:13:00 +00:00
|
|
|
NOTE: SVN itself only stores times in UTC and nothing else. The regular svn
|
|
|
|
client converts the UTC time to the local time (or based on the TZ=
|
|
|
|
environment). This command has the same behaviour.
|
|
|
|
+
|
2009-07-07 20:22:19 +00:00
|
|
|
Any other arguments are passed directly to 'git log'
|
2006-10-11 21:53:35 +00:00
|
|
|
|
2008-02-10 04:51:08 +00:00
|
|
|
'blame'::
|
2013-10-21 19:36:06 +00:00
|
|
|
Show what revision and author last modified each line of a file. The
|
|
|
|
output of this mode is format-compatible with the output of
|
|
|
|
`svn blame' by default. Like the SVN blame command,
|
|
|
|
local uncommitted changes in the working tree are ignored;
|
|
|
|
the version of the file in the HEAD revision is annotated. Unknown
|
|
|
|
arguments are passed directly to 'git blame'.
|
2008-02-10 04:51:08 +00:00
|
|
|
+
|
2008-05-11 05:11:18 +00:00
|
|
|
--git-format;;
|
2009-07-07 20:22:19 +00:00
|
|
|
Produce output in the same format as 'git blame', but with
|
2013-01-21 19:17:53 +00:00
|
|
|
SVN revision numbers instead of Git commit hashes. In this mode,
|
2008-05-11 05:11:18 +00:00
|
|
|
changes that haven't been committed to SVN (including local
|
|
|
|
working-copy edits) are shown as revision 0.
|
2008-02-10 04:51:08 +00:00
|
|
|
|
2007-04-27 18:57:53 +00:00
|
|
|
'find-rev'::
|
|
|
|
When given an SVN revision number of the form 'rN', returns the
|
2013-01-21 19:17:53 +00:00
|
|
|
corresponding Git commit hash (this can optionally be followed by a
|
2007-04-29 08:35:27 +00:00
|
|
|
tree-ish to specify which branch should be searched). When given a
|
|
|
|
tree-ish, returns the corresponding SVN revision number.
|
2013-01-17 22:19:33 +00:00
|
|
|
+
|
2014-09-07 08:35:19 +00:00
|
|
|
-B;;
|
2013-01-17 22:19:33 +00:00
|
|
|
--before;;
|
|
|
|
Don't require an exact match if given an SVN revision, instead find
|
|
|
|
the commit corresponding to the state of the SVN repository (on the
|
|
|
|
current branch) at the specified revision.
|
|
|
|
+
|
2014-09-07 08:35:19 +00:00
|
|
|
-A;;
|
2013-01-17 22:19:33 +00:00
|
|
|
--after;;
|
|
|
|
Don't require an exact match if given an SVN revision; if there is
|
|
|
|
not an exact match return the closest match searching forward in the
|
|
|
|
history.
|
2007-04-27 18:57:53 +00:00
|
|
|
|
2006-12-16 07:58:08 +00:00
|
|
|
'set-tree'::
|
2006-10-11 21:53:35 +00:00
|
|
|
You should consider using 'dcommit' instead of this command.
|
2006-02-16 09:24:16 +00:00
|
|
|
Commit specified commit or tree objects to SVN. This relies on
|
2017-08-23 17:49:35 +00:00
|
|
|
your imported fetch data being up to date. This makes
|
2006-02-16 09:24:16 +00:00
|
|
|
absolutely no attempts to do patching when committing to SVN, it
|
|
|
|
simply overwrites files with those specified in the tree or
|
|
|
|
commit. All merging is assumed to have taken place
|
2009-07-07 20:22:19 +00:00
|
|
|
independently of 'git svn' functions.
|
2006-02-16 09:24:16 +00:00
|
|
|
|
2008-05-04 22:33:10 +00:00
|
|
|
'create-ignore'::
|
|
|
|
Recursively finds the svn:ignore property on directories and
|
|
|
|
creates matching .gitignore files. The resulting files are staged to
|
2008-05-19 22:47:28 +00:00
|
|
|
be committed, but are not committed. Use -r/--revision to refer to a
|
2008-08-05 16:12:05 +00:00
|
|
|
specific revision.
|
2008-05-04 22:33:10 +00:00
|
|
|
|
2006-08-25 01:07:46 +00:00
|
|
|
'show-ignore'::
|
2006-02-26 10:22:27 +00:00
|
|
|
Recursively finds and lists the svn:ignore property on
|
|
|
|
directories. The output is suitable for appending to
|
|
|
|
the $GIT_DIR/info/exclude file.
|
|
|
|
|
2009-11-16 02:57:16 +00:00
|
|
|
'mkdirs'::
|
2013-01-21 19:17:53 +00:00
|
|
|
Attempts to recreate empty directories that core Git cannot track
|
2009-11-16 02:57:16 +00:00
|
|
|
based on information in $GIT_DIR/svn/<refname>/unhandled.log files.
|
|
|
|
Empty directories are automatically recreated when using
|
|
|
|
"git svn clone" and "git svn rebase", so "mkdirs" is intended
|
|
|
|
for use after commands like "git checkout" or "git reset".
|
2011-04-01 10:26:00 +00:00
|
|
|
(See the svn-remote.<name>.automkdirs config file option for
|
|
|
|
more information.)
|
2009-11-16 02:57:16 +00:00
|
|
|
|
2006-10-11 21:53:35 +00:00
|
|
|
'commit-diff'::
|
|
|
|
Commits the diff of two tree-ish arguments from the
|
2018-06-22 06:50:37 +00:00
|
|
|
command-line. This command does not rely on being inside a `git svn
|
2008-06-30 18:56:34 +00:00
|
|
|
init`-ed repository. This command takes three arguments, (a) the
|
2006-10-11 21:53:35 +00:00
|
|
|
original tree to diff against, (b) the new tree result, (c) the
|
|
|
|
URL of the target Subversion repository. The final argument
|
2009-07-07 20:22:19 +00:00
|
|
|
(URL) may be omitted if you are working from a 'git svn'-aware
|
|
|
|
repository (that has been `init`-ed with 'git svn').
|
2006-11-09 09:19:37 +00:00
|
|
|
The -r<revision> option is required for this.
|
2017-06-14 09:31:38 +00:00
|
|
|
+
|
|
|
|
The commit message is supplied either directly with the `-m` or `-F`
|
|
|
|
option, or indirectly from the tag or commit when the second tree-ish
|
|
|
|
denotes such an object, or it is requested by invoking an editor (see
|
|
|
|
`--edit` option below).
|
|
|
|
|
|
|
|
-m <msg>;;
|
|
|
|
--message=<msg>;;
|
|
|
|
Use the given `msg` as the commit message. This option
|
|
|
|
disables the `--edit` option.
|
|
|
|
|
|
|
|
-F <filename>;;
|
|
|
|
--file=<filename>;;
|
|
|
|
Take the commit message from the given file. This option
|
|
|
|
disables the `--edit` option.
|
2006-10-11 21:53:35 +00:00
|
|
|
|
2007-11-21 19:57:18 +00:00
|
|
|
'info'::
|
|
|
|
Shows information about a file or directory similar to what
|
|
|
|
`svn info' provides. Does not currently support a -r/--revision
|
2007-11-21 19:57:19 +00:00
|
|
|
argument. Use the --url option to output only the value of the
|
|
|
|
'URL:' field.
|
2007-11-21 19:57:18 +00:00
|
|
|
|
2008-05-19 22:47:28 +00:00
|
|
|
'proplist'::
|
|
|
|
Lists the properties stored in the Subversion repository about a
|
|
|
|
given file or directory. Use -r/--revision to refer to a specific
|
|
|
|
Subversion revision.
|
|
|
|
|
|
|
|
'propget'::
|
|
|
|
Gets the Subversion property given as the first argument, for a
|
|
|
|
file. A specific revision can be specified with -r/--revision.
|
|
|
|
|
2016-06-15 05:19:50 +00:00
|
|
|
'propset'::
|
|
|
|
Sets the Subversion property given as the first argument, to the
|
|
|
|
value given as the second argument for the file given as the
|
|
|
|
third argument.
|
|
|
|
+
|
|
|
|
Example:
|
|
|
|
+
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
git svn propset svn:keywords "FreeBSD=%H" devel/py-tipper/Makefile
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
+
|
|
|
|
This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file
|
|
|
|
'devel/py-tipper/Makefile'.
|
|
|
|
|
2008-05-19 22:47:28 +00:00
|
|
|
'show-externals'::
|
|
|
|
Shows the Subversion externals. Use -r/--revision to specify a
|
|
|
|
specific revision.
|
|
|
|
|
2009-07-19 23:00:52 +00:00
|
|
|
'gc'::
|
2013-09-29 23:45:58 +00:00
|
|
|
Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove
|
|
|
|
$GIT_DIR/svn/<refname>/index files.
|
2009-07-19 23:00:52 +00:00
|
|
|
|
2009-06-04 03:45:52 +00:00
|
|
|
'reset'::
|
|
|
|
Undoes the effects of 'fetch' back to the specified revision.
|
|
|
|
This allows you to re-'fetch' an SVN revision. Normally the
|
|
|
|
contents of an SVN revision should never change and 'reset'
|
|
|
|
should not be necessary. However, if SVN permissions change,
|
|
|
|
or if you alter your --ignore-paths option, a 'fetch' may fail
|
|
|
|
with "not found in commit" (file not previously visible) or
|
|
|
|
"checksum mismatch" (missed a modification). If the problem
|
|
|
|
file cannot be ignored forever (with --ignore-paths) the only
|
|
|
|
way to repair the repo is to use 'reset'.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2013-09-29 23:46:00 +00:00
|
|
|
Only the rev_map and refs/remotes/git-svn are changed (see
|
2019-03-06 06:30:17 +00:00
|
|
|
'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details).
|
2013-09-29 23:46:00 +00:00
|
|
|
Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to
|
|
|
|
move local branches onto the new tree.
|
2009-06-04 03:45:52 +00:00
|
|
|
|
2009-07-07 20:22:20 +00:00
|
|
|
-r <n>;;
|
|
|
|
--revision=<n>;;
|
2009-06-04 03:45:52 +00:00
|
|
|
Specify the most recent revision to keep. All later revisions
|
|
|
|
are discarded.
|
2009-07-07 20:22:20 +00:00
|
|
|
-p;;
|
|
|
|
--parent;;
|
2009-06-04 03:45:52 +00:00
|
|
|
Discard the specified revision as well, keeping the nearest
|
|
|
|
parent instead.
|
|
|
|
Example:;;
|
|
|
|
Assume you have local changes in "master", but you need to refetch "r2".
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-06-04 03:45:52 +00:00
|
|
|
------------
|
|
|
|
r1---r2---r3 remotes/git-svn
|
|
|
|
\
|
|
|
|
A---B master
|
|
|
|
------------
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-06-04 03:45:52 +00:00
|
|
|
Fix the ignore-paths or SVN permissions problem that caused "r2" to
|
|
|
|
be incomplete in the first place. Then:
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-06-04 03:45:52 +00:00
|
|
|
[verse]
|
|
|
|
git svn reset -r2 -p
|
|
|
|
git svn fetch
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-06-04 03:45:52 +00:00
|
|
|
------------
|
|
|
|
r1---r2'--r3' remotes/git-svn
|
|
|
|
\
|
|
|
|
r2---r3---A---B master
|
|
|
|
------------
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-07-07 20:22:19 +00:00
|
|
|
Then fixup "master" with 'git rebase'.
|
|
|
|
Do NOT use 'git merge' or your history will not be compatible with a
|
2009-06-04 03:45:52 +00:00
|
|
|
future 'dcommit'!
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-06-04 03:45:52 +00:00
|
|
|
[verse]
|
|
|
|
git rebase --onto remotes/git-svn A^ master
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-06-04 03:45:52 +00:00
|
|
|
------------
|
|
|
|
r1---r2'--r3' remotes/git-svn
|
|
|
|
\
|
|
|
|
A'--B' master
|
|
|
|
------------
|
|
|
|
|
2006-02-16 09:24:16 +00:00
|
|
|
OPTIONS
|
|
|
|
-------
|
2006-08-25 01:07:46 +00:00
|
|
|
|
2010-10-08 17:31:17 +00:00
|
|
|
--shared[=(false|true|umask|group|all|world|everybody)]::
|
2006-10-11 21:53:35 +00:00
|
|
|
--template=<template_directory>::
|
|
|
|
Only used with the 'init' command.
|
2009-07-07 20:22:19 +00:00
|
|
|
These are passed directly to 'git init'.
|
2006-10-11 21:53:35 +00:00
|
|
|
|
2011-02-17 07:48:06 +00:00
|
|
|
-r <arg>::
|
|
|
|
--revision <arg>::
|
2009-07-07 20:22:20 +00:00
|
|
|
Used with the 'fetch' command.
|
|
|
|
+
|
2007-02-15 03:34:56 +00:00
|
|
|
This allows revision ranges for partial/cauterized history
|
|
|
|
to be supported. $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges),
|
|
|
|
$NUMBER:HEAD, and BASE:$NUMBER are all supported.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2007-02-15 03:34:56 +00:00
|
|
|
This can allow you to make partial mirrors when running fetch;
|
|
|
|
but is generally not recommended because history will be skipped
|
|
|
|
and lost.
|
2006-02-16 09:24:16 +00:00
|
|
|
|
|
|
|
-::
|
|
|
|
--stdin::
|
2009-07-07 20:22:20 +00:00
|
|
|
Only used with the 'set-tree' command.
|
|
|
|
+
|
2006-08-25 01:07:46 +00:00
|
|
|
Read a list of commits from stdin and commit them in reverse
|
|
|
|
order. Only the leading sha1 is read from each line, so
|
2009-07-07 20:22:19 +00:00
|
|
|
'git rev-list --pretty=oneline' output can be used.
|
2006-02-16 09:24:16 +00:00
|
|
|
|
|
|
|
--rmdir::
|
2009-07-07 20:22:20 +00:00
|
|
|
Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands.
|
|
|
|
+
|
2006-08-25 01:07:46 +00:00
|
|
|
Remove directories from the SVN tree if there are no files left
|
|
|
|
behind. SVN can version empty directories, and they are not
|
2013-01-21 19:17:53 +00:00
|
|
|
removed by default if there are no files left in them. Git
|
2006-08-25 01:07:46 +00:00
|
|
|
cannot version empty directories. Enabling this flag will make
|
2013-01-21 19:17:53 +00:00
|
|
|
the commit to SVN act like Git.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
|
|
|
[verse]
|
2007-01-29 00:16:53 +00:00
|
|
|
config key: svn.rmdir
|
2006-04-02 02:25:03 +00:00
|
|
|
|
2006-02-16 09:24:16 +00:00
|
|
|
-e::
|
|
|
|
--edit::
|
2009-07-07 20:22:20 +00:00
|
|
|
Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands.
|
|
|
|
+
|
2006-08-25 01:07:46 +00:00
|
|
|
Edit the commit message before committing to SVN. This is off by
|
|
|
|
default for objects that are commits, and forced on when committing
|
|
|
|
tree objects.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
|
|
|
[verse]
|
2007-01-29 00:16:53 +00:00
|
|
|
config key: svn.edit
|
2006-04-02 02:25:03 +00:00
|
|
|
|
2006-02-20 18:57:26 +00:00
|
|
|
-l<num>::
|
|
|
|
--find-copies-harder::
|
2009-07-07 20:22:20 +00:00
|
|
|
Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands.
|
|
|
|
+
|
2009-07-07 20:22:19 +00:00
|
|
|
They are both passed directly to 'git diff-tree'; see
|
2007-12-29 06:20:38 +00:00
|
|
|
linkgit:git-diff-tree[1] for more information.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2006-08-25 01:07:46 +00:00
|
|
|
[verse]
|
2007-01-29 00:16:53 +00:00
|
|
|
config key: svn.l
|
|
|
|
config key: svn.findcopiesharder
|
2006-04-02 02:25:03 +00:00
|
|
|
|
2006-05-05 19:35:39 +00:00
|
|
|
-A<filename>::
|
|
|
|
--authors-file=<filename>::
|
2018-03-24 10:20:46 +00:00
|
|
|
Syntax is compatible with the file used by 'git cvsimport' but
|
|
|
|
an empty email address can be supplied with '<>':
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2006-05-05 19:35:39 +00:00
|
|
|
------------------------------------------------------------------------
|
2006-08-25 01:07:46 +00:00
|
|
|
loginname = Joe User <user@example.com>
|
2006-05-05 19:35:39 +00:00
|
|
|
------------------------------------------------------------------------
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-07-07 20:22:19 +00:00
|
|
|
If this option is specified and 'git svn' encounters an SVN
|
|
|
|
committer name that does not exist in the authors-file, 'git svn'
|
2006-08-25 01:07:46 +00:00
|
|
|
will abort operation. The user will then have to add the
|
2009-07-07 20:22:19 +00:00
|
|
|
appropriate entry. Re-running the previous 'git svn' command
|
2006-08-25 01:07:46 +00:00
|
|
|
after the authors-file is modified should continue operation.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
|
|
|
[verse]
|
2007-01-29 00:16:53 +00:00
|
|
|
config key: svn.authorsfile
|
2006-10-11 21:53:35 +00:00
|
|
|
|
2009-05-15 01:27:15 +00:00
|
|
|
--authors-prog=<filename>::
|
2009-07-07 20:22:20 +00:00
|
|
|
If this option is specified, for each SVN committer name that
|
|
|
|
does not exist in the authors file, the given file is executed
|
|
|
|
with the committer name as the first argument. The program is
|
2018-03-24 10:20:46 +00:00
|
|
|
expected to return a single line of the form "Name <email>" or
|
|
|
|
"Name <>", which will be treated as if included in the authors
|
|
|
|
file.
|
2016-07-19 10:02:39 +00:00
|
|
|
+
|
2018-03-04 11:22:36 +00:00
|
|
|
Due to historical reasons a relative 'filename' is first searched
|
|
|
|
relative to the current directory for 'init' and 'clone' and relative
|
|
|
|
to the root of the working tree for 'fetch'. If 'filename' is
|
|
|
|
not found, it is searched like any other command in '$PATH'.
|
|
|
|
+
|
2016-07-19 10:02:39 +00:00
|
|
|
[verse]
|
|
|
|
config key: svn.authorsProg
|
2009-05-15 01:27:15 +00:00
|
|
|
|
2006-10-11 21:53:35 +00:00
|
|
|
-q::
|
|
|
|
--quiet::
|
2009-07-07 20:22:19 +00:00
|
|
|
Make 'git svn' less verbose. Specify a second time to make it
|
2009-03-30 18:31:41 +00:00
|
|
|
even less verbose.
|
2006-10-11 21:53:35 +00:00
|
|
|
|
2006-08-26 07:01:23 +00:00
|
|
|
-m::
|
|
|
|
--merge::
|
|
|
|
-s<strategy>::
|
|
|
|
--strategy=<strategy>::
|
2012-05-15 08:45:50 +00:00
|
|
|
-p::
|
2019-11-22 22:59:29 +00:00
|
|
|
--rebase-merges::
|
|
|
|
--preserve-merges (DEPRECATED)::
|
2009-07-07 20:22:20 +00:00
|
|
|
These are only used with the 'dcommit' and 'rebase' commands.
|
|
|
|
+
|
2009-07-07 20:22:19 +00:00
|
|
|
Passed directly to 'git rebase' when using 'dcommit' if a
|
|
|
|
'git reset' cannot be used (see 'dcommit').
|
2006-08-26 07:01:23 +00:00
|
|
|
|
|
|
|
-n::
|
|
|
|
--dry-run::
|
2009-07-07 20:22:20 +00:00
|
|
|
This can be used with the 'dcommit', 'rebase', 'branch' and
|
|
|
|
'tag' commands.
|
|
|
|
+
|
2013-01-21 19:17:53 +00:00
|
|
|
For 'dcommit', print out the series of Git arguments that would show
|
2006-08-26 07:01:23 +00:00
|
|
|
which diffs would be committed to SVN.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2008-05-20 03:29:17 +00:00
|
|
|
For 'rebase', display the local branch associated with the upstream svn
|
|
|
|
repository associated with the current branch and the URL of svn
|
|
|
|
repository that will be fetched from.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2008-10-05 02:35:17 +00:00
|
|
|
For 'branch' and 'tag', display the urls that will be used for copying when
|
|
|
|
creating the branch or tag.
|
|
|
|
|
2011-04-26 11:34:18 +00:00
|
|
|
--use-log-author::
|
2013-01-21 19:17:53 +00:00
|
|
|
When retrieving svn commits into Git (as part of 'fetch', 'rebase', or
|
Documentation: stylistically normalize references to Signed-off-by:
Ted reported an old typo in the git-commit.txt and merge-options.txt.
Namely, the phrase "Signed-off-by line" was used without either a
definite nor indefinite article.
Upon examination, it seems that the documentation (including items in
Documentation/, but also option help strings) have been quite
inconsistent on usage when referring to `Signed-off-by`.
First, very few places used a definite or indefinite article with the
phrase "Signed-off-by line", but that was the initial typo that led
to this investigation. So, normalize using either an indefinite or
definite article consistently.
The original phrasing, in Commit 3f971fc425b (Documentation updates,
2005-08-14), is "Add Signed-off-by line". Commit 6f855371a53 (Add
--signoff, --check, and long option-names. 2005-12-09) switched to
using "Add `Signed-off-by:` line", but didn't normalize the former
commit to match. Later commits seem to have cut and pasted from one
or the other, which is likely how the usage became so inconsistent.
Junio stated on the git mailing list in
<xmqqy2k1dfoh.fsf@gitster.c.googlers.com> a preference to leave off
the colon. Thus, prefer `Signed-off-by` (with backticks) for the
documentation files and Signed-off-by (without backticks) for option
help strings.
Additionally, Junio argued that "trailer" is now the standard term to
refer to `Signed-off-by`, saying that "becomes plenty clear that we
are not talking about any random line in the log message". As such,
prefer "trailer" over "line" anywhere the former word fits.
However, leave alone those few places in documentation that use
Signed-off-by to refer to the process (rather than the specific
trailer), or in places where mail headers are generally discussed in
comparison with Signed-off-by.
Reported-by: "Theodore Y. Ts'o" <tytso@mit.edu>
Signed-off-by: Bradley M. Kuhn <bkuhn@sfconservancy.org>
Acked-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-10-20 01:03:55 +00:00
|
|
|
'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer
|
2011-04-26 11:34:18 +00:00
|
|
|
in the log message and use that as the author string.
|
2016-12-11 00:06:46 +00:00
|
|
|
+
|
|
|
|
[verse]
|
|
|
|
config key: svn.useLogAuthor
|
|
|
|
|
2011-04-26 11:34:18 +00:00
|
|
|
--add-author-from::
|
2018-05-03 18:48:28 +00:00
|
|
|
When committing to svn from Git (as part of 'set-tree' or 'dcommit'
|
2011-04-26 11:34:18 +00:00
|
|
|
operations), if the existing log message doesn't already have a
|
Documentation: stylistically normalize references to Signed-off-by:
Ted reported an old typo in the git-commit.txt and merge-options.txt.
Namely, the phrase "Signed-off-by line" was used without either a
definite nor indefinite article.
Upon examination, it seems that the documentation (including items in
Documentation/, but also option help strings) have been quite
inconsistent on usage when referring to `Signed-off-by`.
First, very few places used a definite or indefinite article with the
phrase "Signed-off-by line", but that was the initial typo that led
to this investigation. So, normalize using either an indefinite or
definite article consistently.
The original phrasing, in Commit 3f971fc425b (Documentation updates,
2005-08-14), is "Add Signed-off-by line". Commit 6f855371a53 (Add
--signoff, --check, and long option-names. 2005-12-09) switched to
using "Add `Signed-off-by:` line", but didn't normalize the former
commit to match. Later commits seem to have cut and pasted from one
or the other, which is likely how the usage became so inconsistent.
Junio stated on the git mailing list in
<xmqqy2k1dfoh.fsf@gitster.c.googlers.com> a preference to leave off
the colon. Thus, prefer `Signed-off-by` (with backticks) for the
documentation files and Signed-off-by (without backticks) for option
help strings.
Additionally, Junio argued that "trailer" is now the standard term to
refer to `Signed-off-by`, saying that "becomes plenty clear that we
are not talking about any random line in the log message". As such,
prefer "trailer" over "line" anywhere the former word fits.
However, leave alone those few places in documentation that use
Signed-off-by to refer to the process (rather than the specific
trailer), or in places where mail headers are generally discussed in
comparison with Signed-off-by.
Reported-by: "Theodore Y. Ts'o" <tytso@mit.edu>
Signed-off-by: Bradley M. Kuhn <bkuhn@sfconservancy.org>
Acked-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-10-20 01:03:55 +00:00
|
|
|
`From:` or `Signed-off-by` trailer, append a `From:` line based on the
|
2013-01-21 19:17:53 +00:00
|
|
|
Git commit's author string. If you use this, then `--use-log-author`
|
2011-04-26 11:34:18 +00:00
|
|
|
will retrieve a valid author string for all commits.
|
2016-12-11 00:06:46 +00:00
|
|
|
+
|
|
|
|
[verse]
|
|
|
|
config key: svn.addAuthorFrom
|
2006-05-05 19:35:39 +00:00
|
|
|
|
2006-03-03 09:20:09 +00:00
|
|
|
ADVANCED OPTIONS
|
|
|
|
----------------
|
2006-08-25 01:07:46 +00:00
|
|
|
|
2006-03-03 09:20:09 +00:00
|
|
|
-i<GIT_SVN_ID>::
|
|
|
|
--id <GIT_SVN_ID>::
|
2009-07-07 20:22:20 +00:00
|
|
|
This sets GIT_SVN_ID (instead of using the environment). This
|
|
|
|
allows the user to override the default refname to fetch from
|
|
|
|
when tracking a single URL. The 'log' and 'dcommit' commands
|
|
|
|
no longer require this switch as an argument.
|
2006-08-25 01:07:46 +00:00
|
|
|
|
2007-01-31 11:06:56 +00:00
|
|
|
-R<remote name>::
|
|
|
|
--svn-remote <remote name>::
|
|
|
|
Specify the [svn-remote "<remote name>"] section to use,
|
2007-02-15 03:34:56 +00:00
|
|
|
this allows SVN multiple repositories to be tracked.
|
|
|
|
Default: "svn"
|
2007-01-31 11:06:56 +00:00
|
|
|
|
2006-10-11 21:53:35 +00:00
|
|
|
--follow-parent::
|
2012-11-30 07:16:30 +00:00
|
|
|
This option is only relevant if we are tracking branches (using
|
|
|
|
one of the repository layout options --trunk, --tags,
|
|
|
|
--branches, --stdlayout). For each tracked branch, try to find
|
|
|
|
out where its revision was copied from, and set
|
2013-01-21 19:17:53 +00:00
|
|
|
a suitable parent in the first Git commit for the branch.
|
2006-10-11 21:53:35 +00:00
|
|
|
This is especially helpful when we're tracking a directory
|
2012-11-30 07:16:30 +00:00
|
|
|
that has been moved around within the repository. If this
|
|
|
|
feature is disabled, the branches created by 'git svn' will all
|
|
|
|
be linear and not share any history, meaning that there will be
|
|
|
|
no information on where branches were branched off or merged.
|
|
|
|
However, following long/convoluted histories can take a long
|
|
|
|
time, so disabling this feature may speed up the cloning
|
|
|
|
process. This feature is enabled by default, use
|
2007-02-09 10:45:03 +00:00
|
|
|
--no-follow-parent to disable it.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
|
|
|
[verse]
|
2007-01-29 00:16:53 +00:00
|
|
|
config key: svn.followparent
|
2006-10-11 21:53:35 +00:00
|
|
|
|
2007-02-18 10:10:51 +00:00
|
|
|
CONFIG FILE-ONLY OPTIONS
|
|
|
|
------------------------
|
|
|
|
|
2007-02-18 10:34:09 +00:00
|
|
|
svn.noMetadata::
|
|
|
|
svn-remote.<name>.noMetadata::
|
2009-07-07 20:22:20 +00:00
|
|
|
This gets rid of the 'git-svn-id:' lines at the end of every commit.
|
|
|
|
+
|
2010-08-21 18:52:14 +00:00
|
|
|
This option can only be used for one-shot imports as 'git svn'
|
|
|
|
will not be able to fetch again without metadata. Additionally,
|
2019-03-06 06:30:17 +00:00
|
|
|
if you lose your '$GIT_DIR/svn/\**/.rev_map.*' files, 'git svn' will not
|
2010-08-21 18:52:14 +00:00
|
|
|
be able to rebuild them.
|
2009-07-07 20:22:20 +00:00
|
|
|
+
|
2009-07-07 20:22:19 +00:00
|
|
|
The 'git svn log' command will not work on repositories using
|
2007-03-01 19:41:17 +00:00
|
|
|
this, either. Using this conflicts with the 'useSvmProps'
|
|
|
|
option for (hopefully) obvious reasons.
|
2010-08-21 18:52:14 +00:00
|
|
|
+
|
|
|
|
This option is NOT recommended as it makes it difficult to track down
|
|
|
|
old references to SVN revision numbers in existing documentation, bug
|
Recommend git-filter-repo instead of git-filter-branch
filter-branch suffers from a deluge of disguised dangers that disfigure
history rewrites (i.e. deviate from the deliberate changes). Many of
these problems are unobtrusive and can easily go undiscovered until the
new repository is in use. This can result in problems ranging from an
even messier history than what led folks to filter-branch in the first
place, to data loss or corruption. These issues cannot be backward
compatibly fixed, so add a warning to both filter-branch and its manpage
recommending that another tool (such as filter-repo) be used instead.
Also, update other manpages that referenced filter-branch. Several of
these needed updates even if we could continue recommending
filter-branch, either due to implying that something was unique to
filter-branch when it applied more generally to all history rewriting
tools (e.g. BFG, reposurgeon, fast-import, filter-repo), or because
something about filter-branch was used as an example despite other more
commonly known examples now existing. Reword these sections to fix
these issues and to avoid recommending filter-branch.
Finally, remove the section explaining BFG Repo Cleaner as an
alternative to filter-branch. I feel somewhat bad about this,
especially since I feel like I learned so much from BFG that I put to
good use in filter-repo (which is much more than I can say for
filter-branch), but keeping that section presented a few problems:
* In order to recommend that people quit using filter-branch, we need
to provide them a recomendation for something else to use that
can handle all the same types of rewrites. To my knowledge,
filter-repo is the only such tool. So it needs to be mentioned.
* I don't want to give conflicting recommendations to users
* If we recommend two tools, we shouldn't expect users to learn both
and pick which one to use; we should explain which problems one
can solve that the other can't or when one is much faster than
the other.
* BFG and filter-repo have similar performance
* All filtering types that BFG can do, filter-repo can also do. In
fact, filter-repo comes with a reimplementation of BFG named
bfg-ish which provides the same user-interface as BFG but with
several bugfixes and new features that are hard to implement in
BFG due to its technical underpinnings.
While I could still mention both tools, it seems like I would need to
provide some kind of comparison and I would ultimately just say that
filter-repo can do everything BFG can, so ultimately it seems that it
is just better to remove that section altogether.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-09-04 22:32:38 +00:00
|
|
|
reports, and archives. If you plan to eventually migrate from SVN to
|
|
|
|
Git and are certain about dropping SVN history, consider
|
|
|
|
https://github.com/newren/git-filter-repo[git-filter-repo] instead.
|
|
|
|
filter-repo also allows reformatting of metadata for ease-of-reading
|
|
|
|
and rewriting authorship info for non-"svn.authorsFile" users.
|
2007-02-11 23:21:24 +00:00
|
|
|
|
2007-02-18 10:34:09 +00:00
|
|
|
svn.useSvmProps::
|
|
|
|
svn-remote.<name>.useSvmProps::
|
2009-07-07 20:22:20 +00:00
|
|
|
This allows 'git svn' to re-map repository URLs and UUIDs from
|
|
|
|
mirrors created using SVN::Mirror (or svk) for metadata.
|
|
|
|
+
|
2007-03-01 19:41:17 +00:00
|
|
|
If an SVN revision has a property, "svm:headrev", it is likely
|
|
|
|
that the revision was created by SVN::Mirror (also used by SVK).
|
|
|
|
The property contains a repository UUID and a revision. We want
|
|
|
|
to make it look like we are mirroring the original URL, so
|
|
|
|
introduce a helper function that returns the original identity
|
|
|
|
URL and UUID, and use it when generating metadata in commit
|
|
|
|
messages.
|
2007-02-11 23:21:24 +00:00
|
|
|
|
2007-02-18 10:34:09 +00:00
|
|
|
svn.useSvnsyncProps::
|
|
|
|
svn-remote.<name>.useSvnsyncprops::
|
2007-02-18 10:10:51 +00:00
|
|
|
Similar to the useSvmProps option; this is for users
|
|
|
|
of the svnsync(1) command distributed with SVN 1.4.x and
|
|
|
|
later.
|
|
|
|
|
2007-02-18 10:34:09 +00:00
|
|
|
svn-remote.<name>.rewriteRoot::
|
2007-02-18 10:10:51 +00:00
|
|
|
This allows users to create repositories from alternate
|
2009-07-07 20:22:19 +00:00
|
|
|
URLs. For example, an administrator could run 'git svn' on the
|
2007-02-18 10:10:51 +00:00
|
|
|
server locally (accessing via file://) but wish to distribute
|
|
|
|
the repository with a public http:// or svn:// URL in the
|
|
|
|
metadata so users of it will see the public URL.
|
|
|
|
|
2010-01-23 08:30:00 +00:00
|
|
|
svn-remote.<name>.rewriteUUID::
|
|
|
|
Similar to the useSvmProps option; this is for users who need
|
|
|
|
to remap the UUID manually. This may be useful in situations
|
|
|
|
where the original UUID is not available via either useSvmProps
|
|
|
|
or useSvnsyncProps.
|
|
|
|
|
2011-04-08 14:57:54 +00:00
|
|
|
svn-remote.<name>.pushurl::
|
|
|
|
|
2016-06-08 17:23:16 +00:00
|
|
|
Similar to Git's `remote.<name>.pushurl`, this key is designed
|
2011-04-08 14:57:54 +00:00
|
|
|
to be used in cases where 'url' points to an SVN repository
|
|
|
|
via a read-only transport, to provide an alternate read/write
|
|
|
|
transport. It is assumed that both keys point to the same
|
|
|
|
repository. Unlike 'commiturl', 'pushurl' is a base path. If
|
|
|
|
either 'commiturl' or 'pushurl' could be used, 'commiturl'
|
|
|
|
takes precedence.
|
|
|
|
|
2009-02-01 01:31:12 +00:00
|
|
|
svn.brokenSymlinkWorkaround::
|
2009-07-07 20:22:20 +00:00
|
|
|
This disables potentially expensive checks to workaround
|
|
|
|
broken symlinks checked into SVN by broken clients. Set this
|
|
|
|
option to "false" if you track a SVN repository with many
|
|
|
|
empty blobs that are not symlinks. This option may be changed
|
|
|
|
while 'git svn' is running and take effect on the next
|
|
|
|
revision fetched. If unset, 'git svn' assumes this option to
|
|
|
|
be "true".
|
2008-06-19 22:41:42 +00:00
|
|
|
|
2010-07-30 02:30:13 +00:00
|
|
|
svn.pathnameencoding::
|
|
|
|
This instructs git svn to recode pathnames to a given encoding.
|
|
|
|
It can be used by windows users and by those who work in non-utf8
|
|
|
|
locales to avoid corrupted file names with non-ASCII characters.
|
|
|
|
Valid encodings are the ones supported by Perl's Encode module.
|
|
|
|
|
2011-04-01 10:26:00 +00:00
|
|
|
svn-remote.<name>.automkdirs::
|
|
|
|
Normally, the "git svn clone" and "git svn rebase" commands
|
|
|
|
attempt to recreate empty directories that are in the
|
|
|
|
Subversion repository. If this option is set to "false", then
|
|
|
|
empty directories will only be created if the "git svn mkdirs"
|
|
|
|
command is run explicitly. If unset, 'git svn' assumes this
|
|
|
|
option to be "true".
|
|
|
|
|
2010-01-23 08:30:00 +00:00
|
|
|
Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps
|
2009-07-07 20:22:19 +00:00
|
|
|
options all affect the metadata generated and used by 'git svn'; they
|
2007-02-18 10:10:51 +00:00
|
|
|
*must* be set in the configuration file before any history is imported
|
|
|
|
and these settings should never be changed once they are set.
|
|
|
|
|
2010-01-23 08:30:00 +00:00
|
|
|
Additionally, only one of these options can be used per svn-remote
|
|
|
|
section because they affect the 'git-svn-id:' metadata line, except
|
|
|
|
for rewriteRoot and rewriteUUID which can be used together.
|
2006-10-11 21:53:35 +00:00
|
|
|
|
2006-03-03 09:20:09 +00:00
|
|
|
|
2007-03-01 19:41:17 +00:00
|
|
|
BASIC EXAMPLES
|
|
|
|
--------------
|
2006-02-16 09:24:16 +00:00
|
|
|
|
2012-11-30 07:16:30 +00:00
|
|
|
Tracking and contributing to the trunk of a Subversion-managed project
|
|
|
|
(ignoring tags and branches):
|
2006-02-16 09:24:16 +00:00
|
|
|
|
2006-04-02 02:25:03 +00:00
|
|
|
------------------------------------------------------------------------
|
2007-02-18 10:10:51 +00:00
|
|
|
# Clone a repo (like git clone):
|
2008-09-29 23:01:34 +00:00
|
|
|
git svn clone http://svn.example.com/project/trunk
|
2007-02-18 10:10:51 +00:00
|
|
|
# Enter the newly cloned directory:
|
|
|
|
cd trunk
|
2009-07-07 20:22:19 +00:00
|
|
|
# You should be on master branch, double-check with 'git branch'
|
2007-02-18 10:10:51 +00:00
|
|
|
git branch
|
2013-01-21 19:17:53 +00:00
|
|
|
# Do some work and commit locally to Git:
|
2007-02-18 10:10:51 +00:00
|
|
|
git commit ...
|
|
|
|
# Something is committed to SVN, rebase your local changes against the
|
|
|
|
# latest changes in SVN:
|
2008-06-30 06:09:04 +00:00
|
|
|
git svn rebase
|
2013-01-21 19:17:53 +00:00
|
|
|
# Now commit your changes (that were committed previously using Git) to SVN,
|
2007-02-18 10:10:51 +00:00
|
|
|
# as well as automatically updating your working HEAD:
|
2008-06-30 06:09:04 +00:00
|
|
|
git svn dcommit
|
2013-01-21 19:17:53 +00:00
|
|
|
# Append svn:ignore settings to the default Git exclude file:
|
2008-06-30 06:09:04 +00:00
|
|
|
git svn show-ignore >> .git/info/exclude
|
2006-04-02 02:25:03 +00:00
|
|
|
------------------------------------------------------------------------
|
2006-02-16 09:24:16 +00:00
|
|
|
|
2007-01-05 02:04:06 +00:00
|
|
|
Tracking and contributing to an entire Subversion-managed project
|
|
|
|
(complete with a trunk, tags and branches):
|
|
|
|
|
|
|
|
------------------------------------------------------------------------
|
2012-11-30 07:16:30 +00:00
|
|
|
# Clone a repo with standard SVN directory layout (like git clone):
|
Documentation/git-svn: Promote the use of --prefix in docs + examples
Currently, the git-svn defaults to using an empty prefix, which ends
up placing the SVN-tracking refs directly in refs/remotes/*. This
placement runs counter to Git's convention of placing remote-tracking
branches in refs/remotes/$remote/*.
Furthermore, combining git-svn with "regular" Git remotes run the risk
of clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
At this time, the user is better off using the --prefix=foo/ (the
trailing slash is important) to git svn init/clone, to cause the
SVN-tracking refs to be placed at refs/remotes/foo/* instead of
refs/remotes/*. This patch updates the documentation to encourage
use of --prefix.
This is also in preparation for changing the default value of --prefix
at some point in the future.
Cc: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:05 +00:00
|
|
|
git svn clone http://svn.example.com/project --stdlayout --prefix svn/
|
2012-11-30 07:16:30 +00:00
|
|
|
# Or, if the repo uses a non-standard directory layout:
|
Documentation/git-svn: Promote the use of --prefix in docs + examples
Currently, the git-svn defaults to using an empty prefix, which ends
up placing the SVN-tracking refs directly in refs/remotes/*. This
placement runs counter to Git's convention of placing remote-tracking
branches in refs/remotes/$remote/*.
Furthermore, combining git-svn with "regular" Git remotes run the risk
of clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
At this time, the user is better off using the --prefix=foo/ (the
trailing slash is important) to git svn init/clone, to cause the
SVN-tracking refs to be placed at refs/remotes/foo/* instead of
refs/remotes/*. This patch updates the documentation to encourage
use of --prefix.
This is also in preparation for changing the default value of --prefix
at some point in the future.
Cc: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:05 +00:00
|
|
|
git svn clone http://svn.example.com/project -T tr -b branch -t tag --prefix svn/
|
2007-02-18 10:10:51 +00:00
|
|
|
# View all branches and tags you have cloned:
|
|
|
|
git branch -r
|
2008-10-05 02:35:17 +00:00
|
|
|
# Create a new branch in SVN
|
2013-10-21 19:36:06 +00:00
|
|
|
git svn branch waldo
|
2007-02-18 10:10:51 +00:00
|
|
|
# Reset your master to trunk (or any other branch, replacing 'trunk'
|
|
|
|
# with the appropriate name):
|
Documentation/git-svn: Promote the use of --prefix in docs + examples
Currently, the git-svn defaults to using an empty prefix, which ends
up placing the SVN-tracking refs directly in refs/remotes/*. This
placement runs counter to Git's convention of placing remote-tracking
branches in refs/remotes/$remote/*.
Furthermore, combining git-svn with "regular" Git remotes run the risk
of clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
At this time, the user is better off using the --prefix=foo/ (the
trailing slash is important) to git svn init/clone, to cause the
SVN-tracking refs to be placed at refs/remotes/foo/* instead of
refs/remotes/*. This patch updates the documentation to encourage
use of --prefix.
This is also in preparation for changing the default value of --prefix
at some point in the future.
Cc: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:05 +00:00
|
|
|
git reset --hard svn/trunk
|
2007-02-18 10:10:51 +00:00
|
|
|
# You may only dcommit to one branch/tag/trunk at a time. The usage
|
2007-03-01 05:14:23 +00:00
|
|
|
# of dcommit/rebase/show-ignore should be the same as above.
|
2007-01-05 02:04:06 +00:00
|
|
|
------------------------------------------------------------------------
|
|
|
|
|
2009-07-07 20:22:19 +00:00
|
|
|
The initial 'git svn clone' can be quite time-consuming
|
2007-08-06 08:16:43 +00:00
|
|
|
(especially for large Subversion repositories). If multiple
|
|
|
|
people (or one person with multiple machines) want to use
|
2009-07-07 20:22:19 +00:00
|
|
|
'git svn' to interact with the same Subversion repository, you can
|
|
|
|
do the initial 'git svn clone' to a repository on a server and
|
|
|
|
have each person clone that repository with 'git clone':
|
2007-08-06 08:16:43 +00:00
|
|
|
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
# Do the initial import on a server
|
Documentation/git-svn: Promote the use of --prefix in docs + examples
Currently, the git-svn defaults to using an empty prefix, which ends
up placing the SVN-tracking refs directly in refs/remotes/*. This
placement runs counter to Git's convention of placing remote-tracking
branches in refs/remotes/$remote/*.
Furthermore, combining git-svn with "regular" Git remotes run the risk
of clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
At this time, the user is better off using the --prefix=foo/ (the
trailing slash is important) to git svn init/clone, to cause the
SVN-tracking refs to be placed at refs/remotes/foo/* instead of
refs/remotes/*. This patch updates the documentation to encourage
use of --prefix.
This is also in preparation for changing the default value of --prefix
at some point in the future.
Cc: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:05 +00:00
|
|
|
ssh server "cd /pub && git svn clone http://svn.example.com/project [options...]"
|
2008-01-24 23:10:02 +00:00
|
|
|
# Clone locally - make sure the refs/remotes/ space matches the server
|
|
|
|
mkdir project
|
|
|
|
cd project
|
2008-06-30 06:09:04 +00:00
|
|
|
git init
|
2008-01-24 23:10:02 +00:00
|
|
|
git remote add origin server:/pub/project
|
2011-01-06 19:06:51 +00:00
|
|
|
git config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
|
2008-01-24 23:10:02 +00:00
|
|
|
git fetch
|
2013-01-21 19:17:53 +00:00
|
|
|
# Prevent fetch/pull from remote Git server in the future,
|
2011-01-06 19:06:51 +00:00
|
|
|
# we only want to use git svn for future updates
|
|
|
|
git config --remove-section remote.origin
|
2008-11-14 17:45:14 +00:00
|
|
|
# Create a local branch from one of the branches just fetched
|
|
|
|
git checkout -b master FETCH_HEAD
|
Documentation/git-svn: Promote the use of --prefix in docs + examples
Currently, the git-svn defaults to using an empty prefix, which ends
up placing the SVN-tracking refs directly in refs/remotes/*. This
placement runs counter to Git's convention of placing remote-tracking
branches in refs/remotes/$remote/*.
Furthermore, combining git-svn with "regular" Git remotes run the risk
of clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
At this time, the user is better off using the --prefix=foo/ (the
trailing slash is important) to git svn init/clone, to cause the
SVN-tracking refs to be placed at refs/remotes/foo/* instead of
refs/remotes/*. This patch updates the documentation to encourage
use of --prefix.
This is also in preparation for changing the default value of --prefix
at some point in the future.
Cc: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:05 +00:00
|
|
|
# Initialize 'git svn' locally (be sure to use the same URL and
|
|
|
|
# --stdlayout/-T/-b/-t/--prefix options as were used on server)
|
|
|
|
git svn init http://svn.example.com/project [options...]
|
2007-08-06 08:16:43 +00:00
|
|
|
# Pull the latest changes from Subversion
|
2008-06-30 06:09:04 +00:00
|
|
|
git svn rebase
|
2007-08-06 08:16:43 +00:00
|
|
|
------------------------------------------------------------------------
|
|
|
|
|
2007-01-07 01:53:40 +00:00
|
|
|
REBASE VS. PULL/MERGE
|
|
|
|
---------------------
|
2012-05-17 03:20:43 +00:00
|
|
|
Prefer to use 'git svn rebase' or 'git rebase', rather than
|
|
|
|
'git pull' or 'git merge' to synchronize unintegrated commits with a 'git svn'
|
|
|
|
branch. Doing so will keep the history of unintegrated commits linear with
|
|
|
|
respect to the upstream SVN repository and allow the use of the preferred
|
|
|
|
'git svn dcommit' subcommand to push unintegrated commits back into SVN.
|
|
|
|
|
|
|
|
Originally, 'git svn' recommended that developers pulled or merged from
|
|
|
|
the 'git svn' branch. This was because the author favored
|
2008-06-30 18:56:34 +00:00
|
|
|
`git svn set-tree B` to commit a single head rather than the
|
2012-05-17 03:20:43 +00:00
|
|
|
`git svn set-tree A..B` notation to commit multiple commits. Use of
|
|
|
|
'git pull' or 'git merge' with `git svn set-tree A..B` will cause non-linear
|
|
|
|
history to be flattened when committing into SVN and this can lead to merge
|
|
|
|
commits unexpectedly reversing previous commits in SVN.
|
2006-08-25 19:48:23 +00:00
|
|
|
|
2011-04-19 09:06:46 +00:00
|
|
|
MERGE TRACKING
|
|
|
|
--------------
|
|
|
|
While 'git svn' can track
|
2007-09-18 23:50:42 +00:00
|
|
|
copy history (including branches and tags) for repositories adopting a
|
|
|
|
standard layout, it cannot yet represent merge history that happened
|
|
|
|
inside git back upstream to SVN users. Therefore it is advised that
|
2013-01-21 19:17:53 +00:00
|
|
|
users keep history as linear as possible inside Git to ease
|
2007-09-18 23:50:42 +00:00
|
|
|
compatibility with SVN (see the CAVEATS section below).
|
2006-03-09 11:48:47 +00:00
|
|
|
|
2012-11-30 07:16:30 +00:00
|
|
|
HANDLING OF SVN BRANCHES
|
|
|
|
------------------------
|
|
|
|
If 'git svn' is configured to fetch branches (and --follow-branches
|
2013-01-21 19:17:53 +00:00
|
|
|
is in effect), it sometimes creates multiple Git branches for one
|
2013-04-11 22:36:10 +00:00
|
|
|
SVN branch, where the additional branches have names of the form
|
2012-11-30 07:16:30 +00:00
|
|
|
'branchname@nnn' (with nnn an SVN revision number). These additional
|
|
|
|
branches are created if 'git svn' cannot find a parent commit for the
|
|
|
|
first commit in an SVN branch, to connect the branch to the history of
|
|
|
|
the other branches.
|
|
|
|
|
|
|
|
Normally, the first commit in an SVN branch consists
|
|
|
|
of a copy operation. 'git svn' will read this commit to get the SVN
|
|
|
|
revision the branch was created from. It will then try to find the
|
2013-01-21 19:17:53 +00:00
|
|
|
Git commit that corresponds to this SVN revision, and use that as the
|
2012-11-30 07:16:30 +00:00
|
|
|
parent of the branch. However, it is possible that there is no suitable
|
2013-01-21 19:17:53 +00:00
|
|
|
Git commit to serve as parent. This will happen, among other reasons,
|
2012-11-30 07:16:30 +00:00
|
|
|
if the SVN branch is a copy of a revision that was not fetched by 'git
|
|
|
|
svn' (e.g. because it is an old revision that was skipped with
|
2016-06-28 11:40:11 +00:00
|
|
|
`--revision`), or if in SVN a directory was copied that is not tracked
|
2012-11-30 07:16:30 +00:00
|
|
|
by 'git svn' (such as a branch that is not tracked at all, or a
|
|
|
|
subdirectory of a tracked branch). In these cases, 'git svn' will still
|
2013-01-21 19:17:53 +00:00
|
|
|
create a Git branch, but instead of using an existing Git commit as the
|
2012-11-30 07:16:30 +00:00
|
|
|
parent of the branch, it will read the SVN history of the directory the
|
2013-01-21 19:17:53 +00:00
|
|
|
branch was copied from and create appropriate Git commits. This is
|
2012-11-30 07:16:30 +00:00
|
|
|
indicated by the message "Initializing parent: <branchname>".
|
|
|
|
|
|
|
|
Additionally, it will create a special branch named
|
|
|
|
'<branchname>@<SVN-Revision>', where <SVN-Revision> is the SVN revision
|
|
|
|
number the branch was copied from. This branch will point to the newly
|
|
|
|
created parent commit of the branch. If in SVN the branch was deleted
|
|
|
|
and later recreated from a different version, there will be multiple
|
|
|
|
such branches with an '@'.
|
|
|
|
|
2013-01-21 19:17:53 +00:00
|
|
|
Note that this may mean that multiple Git commits are created for a
|
2012-11-30 07:16:30 +00:00
|
|
|
single SVN revision.
|
|
|
|
|
|
|
|
An example: in an SVN repository with a standard
|
|
|
|
trunk/tags/branches layout, a directory trunk/sub is created in r.100.
|
|
|
|
In r.200, trunk/sub is branched by copying it to branches/. 'git svn
|
2013-01-21 19:17:53 +00:00
|
|
|
clone -s' will then create a branch 'sub'. It will also create new Git
|
2012-11-30 07:16:30 +00:00
|
|
|
commits for r.100 through r.199 and use these as the history of branch
|
2013-01-21 19:17:53 +00:00
|
|
|
'sub'. Thus there will be two Git commits for each revision from r.100
|
2012-11-30 07:16:30 +00:00
|
|
|
to r.199 (one containing trunk/, one containing trunk/sub/). Finally,
|
|
|
|
it will create a branch 'sub@200' pointing to the new parent commit of
|
|
|
|
branch 'sub' (i.e. the commit for r.200 and trunk/sub/).
|
|
|
|
|
2007-08-16 08:56:45 +00:00
|
|
|
CAVEATS
|
|
|
|
-------
|
|
|
|
|
2011-04-19 09:06:46 +00:00
|
|
|
For the sake of simplicity and interoperating with Subversion,
|
|
|
|
it is recommended that all 'git svn' users clone, fetch and dcommit
|
2009-07-07 20:22:19 +00:00
|
|
|
directly from the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push'
|
2013-01-21 19:17:53 +00:00
|
|
|
operations between Git repositories and branches. The recommended
|
|
|
|
method of exchanging code between Git branches and users is
|
2009-07-07 20:22:19 +00:00
|
|
|
'git format-patch' and 'git am', or just 'dcommit'ing to the SVN repository.
|
2007-08-16 08:56:45 +00:00
|
|
|
|
2009-07-07 20:22:19 +00:00
|
|
|
Running 'git merge' or 'git pull' is NOT recommended on a branch you
|
2011-04-19 09:06:46 +00:00
|
|
|
plan to 'dcommit' from because Subversion users cannot see any
|
2013-01-21 19:17:53 +00:00
|
|
|
merges you've made. Furthermore, if you merge or pull from a Git branch
|
2008-06-30 18:56:34 +00:00
|
|
|
that is a mirror of an SVN branch, 'dcommit' may commit to the wrong
|
2007-08-16 08:56:45 +00:00
|
|
|
branch.
|
|
|
|
|
2009-11-16 10:15:17 +00:00
|
|
|
If you do merge, note the following rule: 'git svn dcommit' will
|
|
|
|
attempt to commit on top of the SVN commit named in
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
git log --grep=^git-svn-id: --first-parent -1
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
You 'must' therefore ensure that the most recent commit of the branch
|
|
|
|
you want to dcommit to is the 'first' parent of the merge. Chaos will
|
|
|
|
ensue otherwise, especially if the first parent is an older commit on
|
|
|
|
the same SVN branch.
|
|
|
|
|
2009-07-07 20:22:19 +00:00
|
|
|
'git clone' does not clone branches under the refs/remotes/ hierarchy or
|
|
|
|
any 'git svn' metadata, or config. So repositories created and managed with
|
|
|
|
using 'git svn' should use 'rsync' for cloning, if cloning is to be done
|
2007-08-16 08:56:45 +00:00
|
|
|
at all.
|
|
|
|
|
2013-01-21 19:17:53 +00:00
|
|
|
Since 'dcommit' uses rebase internally, any Git branches you 'git push' to
|
2008-06-30 18:56:34 +00:00
|
|
|
before 'dcommit' on will require forcing an overwrite of the existing ref
|
2007-08-16 08:56:45 +00:00
|
|
|
on the remote repository. This is generally considered bad practice,
|
2008-06-30 18:56:34 +00:00
|
|
|
see the linkgit:git-push[1] documentation for details.
|
2007-08-16 08:56:45 +00:00
|
|
|
|
2008-06-30 18:56:34 +00:00
|
|
|
Do not use the --amend option of linkgit:git-commit[1] on a change you've
|
2007-08-16 08:56:45 +00:00
|
|
|
already dcommitted. It is considered bad practice to --amend commits
|
|
|
|
you've already pushed to a remote repository for other users, and
|
|
|
|
dcommit with SVN is analogous to that.
|
|
|
|
|
2012-11-30 07:16:30 +00:00
|
|
|
When cloning an SVN repository, if none of the options for describing
|
|
|
|
the repository layout is used (--trunk, --tags, --branches,
|
2013-01-21 19:17:53 +00:00
|
|
|
--stdlayout), 'git svn clone' will create a Git repository with
|
2012-11-30 07:16:30 +00:00
|
|
|
completely linear history, where branches and tags appear as separate
|
|
|
|
directories in the working copy. While this is the easiest way to get a
|
|
|
|
copy of a complete repository, for projects with many branches it will
|
|
|
|
lead to a working copy many times larger than just the trunk. Thus for
|
|
|
|
projects using the standard directory structure (trunk/branches/tags),
|
2016-06-28 11:40:11 +00:00
|
|
|
it is recommended to clone with option `--stdlayout`. If the project
|
2012-11-30 07:16:30 +00:00
|
|
|
uses a non-standard structure, and/or if branches and tags are not
|
|
|
|
required, it is easiest to only clone one directory (typically trunk),
|
|
|
|
without giving any repository layout options. If the full history with
|
2016-06-28 11:40:11 +00:00
|
|
|
branches and tags is required, the options `--trunk` / `--branches` /
|
|
|
|
`--tags` must be used.
|
2012-11-30 07:16:30 +00:00
|
|
|
|
2009-07-07 20:22:19 +00:00
|
|
|
When using multiple --branches or --tags, 'git svn' does not automatically
|
2009-06-26 20:49:19 +00:00
|
|
|
handle name collisions (for example, if two branches from different paths have
|
|
|
|
the same name, or if a branch and a tag have the same name). In these cases,
|
2013-01-21 19:17:53 +00:00
|
|
|
use 'init' to set up your Git repository then, before your first 'fetch', edit
|
2013-09-29 23:45:59 +00:00
|
|
|
the $GIT_DIR/config file so that the branches and tags are associated
|
|
|
|
with different name spaces. For example:
|
2009-06-26 20:49:19 +00:00
|
|
|
|
|
|
|
branches = stable/*:refs/remotes/svn/stable/*
|
|
|
|
branches = debug/*:refs/remotes/svn/debug/*
|
|
|
|
|
2007-02-15 03:34:56 +00:00
|
|
|
CONFIGURATION
|
|
|
|
-------------
|
|
|
|
|
2009-07-07 20:22:19 +00:00
|
|
|
'git svn' stores [svn-remote] configuration information in the
|
2013-09-29 23:45:59 +00:00
|
|
|
repository $GIT_DIR/config file. It is similar the core Git
|
2007-02-15 03:34:56 +00:00
|
|
|
[remote] sections except 'fetch' keys do not accept glob
|
|
|
|
arguments; but they are instead handled by the 'branches'
|
|
|
|
and 'tags' keys. Since some SVN repositories are oddly
|
|
|
|
configured with multiple projects glob expansions such those
|
|
|
|
listed below are allowed:
|
|
|
|
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
[svn-remote "project-a"]
|
|
|
|
url = http://server.org/svn
|
2009-04-01 22:05:01 +00:00
|
|
|
fetch = trunk/project-a:refs/remotes/project-a/trunk
|
2007-02-15 03:34:56 +00:00
|
|
|
branches = branches/*/project-a:refs/remotes/project-a/branches/*
|
2016-01-11 14:25:58 +00:00
|
|
|
branches = branches/release_*:refs/remotes/project-a/branches/release_*
|
|
|
|
branches = branches/re*se:refs/remotes/project-a/branches/*
|
2007-02-15 03:34:56 +00:00
|
|
|
tags = tags/*/project-a:refs/remotes/project-a/tags/*
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
|
Documentation/git-svn: improve asciidoctor compatibility
The second paragraph in the CONFIGURATION section intends to emphasize
the word 'must' with bold type. It does so by writing it as *must*, and
this works fine with AsciiDoc. It usually works great with Asciidoctor,
too, but in this particular instance, we have another "*" earlier in the
paragraph. We do escape it, and it is rendered literally just like we
want it to, but Asciidoctor then ends up tripping on the second (or
third) of the asterisks in this paragraph.
Since that asterisk is (part of) a literal example, we can set it in
monospace, by giving it as `*`. Adjust the whole paragraph in this way.
There's lots more monospacing to be done in this document, but since our
main motivation is addressing AsciiDoc/Asciidoctor discrepancies like
this one, let's just convert this one paragraph.
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-10 00:37:34 +00:00
|
|
|
Keep in mind that the `*` (asterisk) wildcard of the local ref
|
|
|
|
(right of the `:`) *must* be the farthest right path component;
|
2009-04-22 15:48:58 +00:00
|
|
|
however the remote wildcard may be anywhere as long as it's an
|
Documentation/git-svn: improve asciidoctor compatibility
The second paragraph in the CONFIGURATION section intends to emphasize
the word 'must' with bold type. It does so by writing it as *must*, and
this works fine with AsciiDoc. It usually works great with Asciidoctor,
too, but in this particular instance, we have another "*" earlier in the
paragraph. We do escape it, and it is rendered literally just like we
want it to, but Asciidoctor then ends up tripping on the second (or
third) of the asterisks in this paragraph.
Since that asterisk is (part of) a literal example, we can set it in
monospace, by giving it as `*`. Adjust the whole paragraph in this way.
There's lots more monospacing to be done in this document, but since our
main motivation is addressing AsciiDoc/Asciidoctor discrepancies like
this one, let's just convert this one paragraph.
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-10 00:37:34 +00:00
|
|
|
independent path component (surrounded by `/` or EOL). This
|
2007-02-15 03:34:56 +00:00
|
|
|
type of configuration is not automatically created by 'init' and
|
2009-07-07 20:22:19 +00:00
|
|
|
should be manually entered with a text-editor or using 'git config'.
|
2007-02-15 03:34:56 +00:00
|
|
|
|
2016-01-11 14:25:58 +00:00
|
|
|
Also note that only one asterisk is allowed per word. For example:
|
|
|
|
|
|
|
|
branches = branches/re*se:refs/remotes/project-a/branches/*
|
|
|
|
|
|
|
|
will match branches 'release', 'rese', 're123se', however
|
|
|
|
|
|
|
|
branches = branches/re*s*e:refs/remotes/project-a/branches/*
|
|
|
|
|
|
|
|
will produce an error.
|
|
|
|
|
2010-01-23 08:30:01 +00:00
|
|
|
It is also possible to fetch a subset of branches or tags by using a
|
|
|
|
comma-separated list of names within braces. For example:
|
|
|
|
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
[svn-remote "huge-project"]
|
|
|
|
url = http://server.org/svn
|
|
|
|
fetch = trunk/src:refs/remotes/trunk
|
Documentation/git-svn: Promote the use of --prefix in docs + examples
Currently, the git-svn defaults to using an empty prefix, which ends
up placing the SVN-tracking refs directly in refs/remotes/*. This
placement runs counter to Git's convention of placing remote-tracking
branches in refs/remotes/$remote/*.
Furthermore, combining git-svn with "regular" Git remotes run the risk
of clobbering refs under refs/remotes (e.g. if you have a git remote
called "tags" with a "v1" branch, it will overlap with the git-svn's
tracking branch for the "v1" tag from Subversion.
Even though the git-svn refs stored in refs/remotes/* are not "proper"
remote-tracking branches (since they are not covered by a proper git
remote's refspec), they clearly represent a similar concept, and would
benefit from following the same convention.
For example, if git-svn tracks Subversion branch "foo" at
refs/remotes/foo, and you create a local branch refs/heads/foo to add
some commits to be pushed back to Subversion (using "git svn dcommit),
then it is clearly unhelpful of Git to throw
warning: refname 'foo' is ambiguous.
every time you checkout, rebase, or otherwise interact with the branch.
At this time, the user is better off using the --prefix=foo/ (the
trailing slash is important) to git svn init/clone, to cause the
SVN-tracking refs to be placed at refs/remotes/foo/* instead of
refs/remotes/*. This patch updates the documentation to encourage
use of --prefix.
This is also in preparation for changing the default value of --prefix
at some point in the future.
Cc: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
2013-10-11 12:57:05 +00:00
|
|
|
branches = branches/{red,green}/src:refs/remotes/project-a/branches/*
|
|
|
|
tags = tags/{1.0,2.0}/src:refs/remotes/project-a/tags/*
|
2010-01-23 08:30:01 +00:00
|
|
|
------------------------------------------------------------------------
|
|
|
|
|
2011-12-20 01:23:50 +00:00
|
|
|
Multiple fetch, branches, and tags keys are supported:
|
|
|
|
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
[svn-remote "messy-repo"]
|
|
|
|
url = http://server.org/svn
|
|
|
|
fetch = trunk/project-a:refs/remotes/project-a/trunk
|
|
|
|
fetch = branches/demos/june-project-a-demo:refs/remotes/project-a/demos/june-demo
|
|
|
|
branches = branches/server/*:refs/remotes/project-a/branches/*
|
|
|
|
branches = branches/demos/2011/*:refs/remotes/project-a/2011-demos/*
|
|
|
|
tags = tags/server/*:refs/remotes/project-a/tags/*
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
|
2011-12-20 01:24:30 +00:00
|
|
|
Creating a branch in such a configuration requires disambiguating which
|
|
|
|
location to use using the -d or --destination flag:
|
|
|
|
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
$ git svn branch -d branches/server release-2-3-0
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
|
2010-01-23 08:30:01 +00:00
|
|
|
Note that git-svn keeps track of the highest revision in which a branch
|
|
|
|
or tag has appeared. If the subset of branches or tags is changed after
|
2013-09-29 23:45:59 +00:00
|
|
|
fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove
|
|
|
|
(or reset) branches-maxRev and/or tags-maxRev as appropriate.
|
2010-01-23 08:30:01 +00:00
|
|
|
|
2013-09-29 23:46:00 +00:00
|
|
|
FILES
|
|
|
|
-----
|
2019-03-06 06:30:17 +00:00
|
|
|
$GIT_DIR/svn/\**/.rev_map.*::
|
2013-09-29 23:46:00 +00:00
|
|
|
Mapping between Subversion revision numbers and Git commit
|
|
|
|
names. In a repository where the noMetadata option is not set,
|
|
|
|
this can be rebuilt from the git-svn-id: lines that are at the
|
|
|
|
end of every commit (see the 'svn.noMetadata' section above for
|
|
|
|
details).
|
|
|
|
+
|
|
|
|
'git svn fetch' and 'git svn rebase' automatically update the rev_map
|
|
|
|
if it is missing or not up to date. 'git svn reset' automatically
|
|
|
|
rewinds it.
|
|
|
|
|
2021-04-09 15:02:50 +00:00
|
|
|
BUGS
|
|
|
|
----
|
|
|
|
|
|
|
|
We ignore all SVN properties except svn:executable. Any unhandled
|
|
|
|
properties are logged to $GIT_DIR/svn/<refname>/unhandled.log
|
|
|
|
|
|
|
|
Renamed and copied directories are not detected by Git and hence not
|
|
|
|
tracked when committing to SVN. I do not plan on adding support for
|
|
|
|
this as it's quite difficult and time-consuming to get working for all
|
|
|
|
the possible corner cases (Git doesn't do it, either). Committing
|
|
|
|
renamed and copied files is fully supported if they're similar enough
|
|
|
|
for Git to detect them.
|
|
|
|
|
|
|
|
In SVN, it is possible (though discouraged) to commit changes to a tag
|
|
|
|
(because a tag is just a directory copy, thus technically the same as a
|
|
|
|
branch). When cloning an SVN repository, 'git svn' cannot know if such a
|
|
|
|
commit to a tag will happen in the future. Thus it acts conservatively
|
|
|
|
and imports all SVN tags as branches, prefixing the tag name with 'tags/'.
|
|
|
|
|
2006-08-25 19:48:23 +00:00
|
|
|
SEE ALSO
|
|
|
|
--------
|
2007-12-29 06:20:38 +00:00
|
|
|
linkgit:git-rebase[1]
|
2011-03-11 06:08:48 +00:00
|
|
|
|
|
|
|
GIT
|
|
|
|
---
|
|
|
|
Part of the linkgit:git[1] suite
|