Changeset 782 for git/branches/dmik/Documentation/git-svn.txt

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• Documentation/git-svn.txt (modified) (40 diffs)

git/branches/dmik/Documentation/git-svn.txt ¶

@@ -4 +4 @@
 NAME
 ----
-git-svn - Bidirectional operation between a Subversion repository and git
+git-svn - Bidirectional operation between a Subversion repository and Git
 
 SYNOPSIS
@@ -13 +13 @@
 DESCRIPTION
 -----------
-'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
+'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
 repository.
 
@@ -22 +22 @@
 (see options to 'init' below, and also the 'clone' command).
 
-Once tracking a Subversion repository (with any of the above methods), the git
+Once tracking a Subversion repository (with any of the above methods), the Git
 repository can be updated from Subversion by the 'fetch' command and
-Subversion updated from git by the 'dcommit' command.
+Subversion updated from Git by the 'dcommit' command.
 
 COMMANDS
@@ -30 +30 @@
 
 'init'::
-        Initializes an empty git repository with additional
+        Initializes an empty Git repository with additional
         metadata directories for 'git svn'.  The Subversion URL
         may be specified as a command-line argument, or as full
@@ -80 +80 @@
         argument if that is what you want.  If --branches/-b is
         specified, the prefix must include a trailing slash.
-        Setting a prefix is useful if you wish to track multiple
-        projects that share a common repository.
+        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.
+        By default, the prefix is set to 'origin/'.
++
+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.
+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).
+
 --ignore-paths=<regex>;;
         When passed to 'init' or 'clone' this regular expression will
         be preserved as a config key.  See 'fetch' for a description
         of '--ignore-paths'.
+--include-paths=<regex>;;
+        When passed to 'init' or 'clone' this regular expression will
+        be preserved as a config key.  See 'fetch' for a description
+        of '--include-paths'.
 --no-minimize-url;;
         When tracking multiple directories (using --stdlayout,
@@ -101 +119 @@
         Fetch unfetched revisions from the Subversion remote we are
         tracking.  The name of the [svn-remote "..."] section in the
-        .git/config file may be specified as an optional command-line
-        argument.
+        $GIT_DIR/config file may be specified as an optional
+        command-line argument.
++
+This automatically updates the rev_map if needed (see
+'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
 
 --localtime;;
-        Store Git commit times in the local timezone instead of UTC.  This
+        Store Git commit times in the local time zone instead of UTC.  This
         makes 'git log' (even without --date=local) show the same times
-        that `svn log` would in the local timezone.
+        that `svn log` would in the local time zone.
 +
 This doesn't interfere with interoperating with the Subversion
@@ -113 +134 @@
 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
-the same local timezone.
+the same local time zone.
 
 --parent;;
@@ -146 +167 @@
 ------------------------------------------------------------------------
 --
+
+--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.
+        The '--include-paths' option should match for every 'fetch'
+        (including automatic fetches due to 'clone', 'dcommit',
+        'rebase', etc) on a given repository. '--ignore-paths' takes
+        precedence over '--include-paths'.
+
+--log-window-size=<n>;;
+        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.
 
 'clone'::
@@ -183 +219 @@
 Like 'git rebase'; this requires that the working tree be clean
 and have no uncommitted changes.
++
+This automatically updates the rev_map if needed (see
+'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
 
 -l;;
@@ -190 +229 @@
 
 'dcommit'::
-        Commit each diff from a specified head directly to the SVN
+        Commit each diff from the current branch directly to the SVN
         repository, and then rebase or reset (depending on whether or
         not there is a diff between SVN and head).  This will create
-        a revision in SVN for each commit in git.
-        It is recommended that you run 'git svn' fetch and rebase (not
-        pull or merge) your commits against the latest changes in the
-        SVN repository.
-        An optional revision or branch argument may be specified, and
-        causes 'git svn' to do all work on that revision/branch
-        instead of HEAD.
-        This is advantageous over 'set-tree' (below) because it produces
-        cleaner, more linear history.
+        a revision in SVN for each commit in Git.
++
+When an optional Git branch name (or a Git commit object name)
+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).
 +
 --no-rebase;;
@@ -240 +277 @@
         patch), "all" (accept all patches), or "quit".
         +
-        'git svn dcommit' returns immediately if answer if "no" or "quit", without
-        commiting anything to SVN.
+        'git svn dcommit' returns immediately if answer is "no" or "quit", without
+        committing anything to SVN.
 
 'branch'::
@@ -255 +292 @@
         specified during git svn init.
 
--d;;
---destination;;
+-d<path>;;
+--destination=<path>;;
+
         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
-        tag) you wish to create in the SVN repository.  The value of this
-        option must match one of the paths specified by a --branches (or
-        --tags) option.  You can see these paths with the commands
+        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
 +
         git config --get-all svn-remote.<name>.branches
@@ -281 +320 @@
         git config --get-all svn-remote.<name>.commiturl
 +
+
+--parents;;
+        Create parent folders. This parameter is equivalent to the parameter
+        --parents on svn cp commands and is useful for non-standard repository
+        layouts.
 
 'tag'::
@@ -312 +356 @@
 --
 --show-commit;;
-        shows the git commit sha1, as well
+        shows the Git commit sha1, as well
 --oneline;;
         our version of --pretty=oneline
@@ -324 +368 @@
 
 'blame'::
-       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'.
+        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'.
 +
 --git-format;;
         Produce output in the same format as 'git blame', but with
-        SVN revision numbers instead of git commit hashes. In this mode,
+        SVN revision numbers instead of Git commit hashes. In this mode,
         changes that haven't been committed to SVN (including local
         working-copy edits) are shown as revision 0.
@@ -339 +383 @@
 'find-rev'::
         When given an SVN revision number of the form 'rN', returns the
-        corresponding git commit hash (this can optionally be followed by a
+        corresponding Git commit hash (this can optionally be followed by a
         tree-ish to specify which branch should be searched).  When given a
         tree-ish, returns the corresponding SVN revision number.
++
+--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.
++
+--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.
 
 'set-tree'::
@@ -364 +418 @@
 
 'mkdirs'::
-        Attempts to recreate empty directories that core git cannot track
+        Attempts to recreate empty directories that core Git cannot track
         based on information in $GIT_DIR/svn/<refname>/unhandled.log files.
         Empty directories are automatically recreated when using
@@ -402 +456 @@
 
 'gc'::
-        Compress $GIT_DIR/svn/<refname>/unhandled.log files in .git/svn
-        and remove $GIT_DIR/svn/<refname>index files in .git/svn.
+        Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove
+        $GIT_DIR/svn/<refname>/index files.
 
 'reset'::
@@ -416 +470 @@
         way to repair the repo is to use 'reset'.
 +
-Only the rev_map and refs/remotes/git-svn are changed.  Follow 'reset'
-with a 'fetch' and then 'git reset' or 'git rebase' to move local
-branches onto the new tree.
+Only the rev_map and refs/remotes/git-svn are changed (see
+'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
+Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to
+move local branches onto the new tree.
 
 -r <n>;;
@@ -496 +551 @@
 Remove directories from the SVN tree if there are no files left
 behind.  SVN can version empty directories, and they are not
-removed by default if there are no files left in them.  git
+removed by default if there are no files left in them.  Git
 cannot version empty directories.  Enabling this flag will make
-the commit to SVN act like git.
+the commit to SVN act like Git.
 +
 [verse]
@@ -573 +628 @@
 -s<strategy>::
 --strategy=<strategy>::
+-p::
+--preserve-merges::
         These are only used with the 'dcommit' and 'rebase' commands.
 +
@@ -583 +640 @@
         'tag' commands.
 +
-For 'dcommit', print out the series of git arguments that would show
+For 'dcommit', print out the series of Git arguments that would show
 which diffs would be committed to SVN.
 +
@@ -594 +651 @@
 
 --use-log-author::
-        When retrieving svn commits into git (as part of 'fetch', 'rebase', or
+        When retrieving svn commits into Git (as part of 'fetch', 'rebase', or
         'dcommit' operations), look for the first `From:` or `Signed-off-by:` line
         in the log message and use that as the author string.
 --add-author-from::
-        When committing to svn from git (as part of 'commit-diff', 'set-tree' or 'dcommit'
+        When committing to svn from Git (as part of 'commit-diff', 'set-tree' or 'dcommit'
         operations), if the existing log message doesn't already have a
         `From:` or `Signed-off-by:` line, append a `From:` line based on the
-        git commit's author string.  If you use this, then `--use-log-author`
+        Git commit's author string.  If you use this, then `--use-log-author`
         will retrieve a valid author string for all commits.
 
@@ -622 +679 @@
 
 --follow-parent::
+        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
+        a suitable parent in the first Git commit for the branch.
         This is especially helpful when we're tracking a directory
-        that has been moved around within the repository, or if we
-        started tracking a branch and never tracked the trunk it was
-        descended from. This feature is enabled by default, use
+        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
         --no-follow-parent to disable it.
 +
@@ -640 +706 @@
 This option can only be used for one-shot imports as 'git svn'
 will not be able to fetch again without metadata. Additionally,
-if you lose your .git/svn/**/.rev_map.* files, 'git svn' will not
+if you lose your '$GIT_DIR/svn/\*\*/.rev_map.*' files, 'git svn' will not
 be able to rebuild them.
 +
@@ -649 +715 @@
 This option is NOT recommended as it makes it difficult to track down
 old references to SVN revision numbers in existing documentation, bug
-reports and archives.  If you plan to eventually migrate from SVN to git
+reports and archives.  If you plan to eventually migrate from SVN to Git
 and are certain about dropping SVN history, consider
 linkgit:git-filter-branch[1] instead.  filter-branch also allows
@@ -689 +755 @@
 svn-remote.<name>.pushurl::
 
-        Similar to git's 'remote.<name>.pushurl', this key is designed
+        Similar to Git's 'remote.<name>.pushurl', this key is designed
         to be used in cases where 'url' points to an SVN repository
         via a read-only transport, to provide an alternate read/write
@@ -733 +799 @@
 --------------
 
-Tracking and contributing to the trunk of a Subversion-managed project:
+Tracking and contributing to the trunk of a Subversion-managed project
+(ignoring tags and branches):
 
 ------------------------------------------------------------------------
@@ -742 +809 @@
 # You should be on master branch, double-check with 'git branch'
         git branch
-# Do some work and commit locally to git:
+# Do some work and commit locally to Git:
         git commit ...
 # Something is committed to SVN, rebase your local changes against the
 # latest changes in SVN:
         git svn rebase
-# Now commit your changes (that were committed previously using git) to SVN,
+# Now commit your changes (that were committed previously using Git) to SVN,
 # as well as automatically updating your working HEAD:
         git svn dcommit
-# Append svn:ignore settings to the default git exclude file:
+# Append svn:ignore settings to the default Git exclude file:
         git svn show-ignore >> .git/info/exclude
 ------------------------------------------------------------------------
@@ -758 +825 @@
 
 ------------------------------------------------------------------------
-# Clone a repo (like git clone):
-        git svn clone http://svn.example.com/project -T trunk -b branches -t tags
+# Clone a repo with standard SVN directory layout (like git clone):
+        git svn clone http://svn.example.com/project --stdlayout --prefix svn/
+# Or, if the repo uses a non-standard directory layout:
+        git svn clone http://svn.example.com/project -T tr -b branch -t tag --prefix svn/
 # View all branches and tags you have cloned:
         git branch -r
 # Create a new branch in SVN
-    git svn branch waldo
+        git svn branch waldo
 # Reset your master to trunk (or any other branch, replacing 'trunk'
 # with the appropriate name):
-        git reset --hard remotes/trunk
+        git reset --hard svn/trunk
 # You may only dcommit to one branch/tag/trunk at a time.  The usage
 # of dcommit/rebase/show-ignore should be the same as above.
@@ -780 +849 @@
 ------------------------------------------------------------------------
 # Do the initial import on a server
-        ssh server "cd /pub && git svn clone http://svn.example.com/project
+        ssh server "cd /pub && git svn clone http://svn.example.com/project [options...]"
 # Clone locally - make sure the refs/remotes/ space matches the server
         mkdir project
@@ -788 +857 @@
         git config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
         git fetch
-# Prevent fetch/pull from remote git server in the future,
+# Prevent fetch/pull from remote Git server in the future,
 # we only want to use git svn for future updates
         git config --remove-section remote.origin
 # Create a local branch from one of the branches just fetched
         git checkout -b master FETCH_HEAD
-# Initialize 'git svn' locally (be sure to use the same URL and -T/-b/-t options as were used on server)
-        git svn init http://svn.example.com/project
+# 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...]
 # Pull the latest changes from Subversion
         git svn rebase
@@ -801 +871 @@
 REBASE VS. PULL/MERGE
 ---------------------
-
-Originally, 'git svn' recommended that the 'remotes/git-svn' branch be
-pulled or merged from.  This is because the author favored
+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
 `git svn set-tree B` to commit a single head rather than the
-`git svn set-tree A..B` notation to commit multiple commits.
-
-If you use `git svn set-tree A..B` to commit several diffs and you do
-not have the latest remotes/git-svn merged into my-branch, you should
-use `git svn rebase` to update your work branch instead of `git pull` or
-`git merge`.  `pull`/`merge` can cause non-linear history to be flattened
-when committing into SVN, which can lead to merge commits reversing
-previous commits in SVN.
+`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.
 
 MERGE TRACKING
@@ -820 +891 @@
 standard layout, it cannot yet represent merge history that happened
 inside git back upstream to SVN users.  Therefore it is advised that
-users keep history as linear as possible inside git to ease
+users keep history as linear as possible inside Git to ease
 compatibility with SVN (see the CAVEATS section below).
+
+HANDLING OF SVN BRANCHES
+------------------------
+If 'git svn' is configured to fetch branches (and --follow-branches
+is in effect), it sometimes creates multiple Git branches for one
+SVN branch, where the additional branches have names of the form
+'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
+Git commit that corresponds to this SVN revision, and use that as the
+parent of the branch. However, it is possible that there is no suitable
+Git commit to serve as parent.  This will happen, among other reasons,
+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
+'--revision'), or if in SVN a directory was copied that is not tracked
+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
+create a Git branch, but instead of using an existing Git commit as the
+parent of the branch, it will read the SVN history of the directory the
+branch was copied from and create appropriate Git commits.  This is
+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 '@'.
+
+Note that this may mean that multiple Git commits are created for a
+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
+clone -s' will then create a branch 'sub'. It will also create new Git
+commits for r.100 through r.199 and use these as the history of branch
+'sub'. Thus there will be two Git commits for each revision from r.100
+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/).
 
 CAVEATS
@@ -829 +946 @@
 it is recommended that all 'git svn' users clone, fetch and dcommit
 directly from the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push'
-operations between git repositories and branches.  The recommended
-method of exchanging code between git branches and users is
+operations between Git repositories and branches.  The recommended
+method of exchanging code between Git branches and users is
 'git format-patch' and 'git am', or just 'dcommit'ing to the SVN repository.
 
 Running 'git merge' or 'git pull' is NOT recommended on a branch you
 plan to 'dcommit' from because Subversion users cannot see any
-merges you've made.  Furthermore, if you merge or pull from a git branch
+merges you've made.  Furthermore, if you merge or pull from a Git branch
 that is a mirror of an SVN branch, 'dcommit' may commit to the wrong
 branch.
@@ -854 +971 @@
 at all.
 
-Since 'dcommit' uses rebase internally, any git branches you 'git push' to
+Since 'dcommit' uses rebase internally, any Git branches you 'git push' to
 before 'dcommit' on will require forcing an overwrite of the existing ref
 on the remote repository.  This is generally considered bad practice,
@@ -864 +981 @@
 dcommit with SVN is analogous to that.
 
+When cloning an SVN repository, if none of the options for describing
+the repository layout is used (--trunk, --tags, --branches,
+--stdlayout), 'git svn clone' will create a Git repository with
+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),
+it is recommended to clone with option '--stdlayout'. If the project
+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
+branches and tags is required, the options '--trunk' / '--branches' /
+'--tags' must be used.
+
 When using multiple --branches or --tags, 'git svn' does not automatically
 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,
-use 'init' to set up your git repository then, before your first 'fetch', edit
-the .git/config file so that the branches and tags are associated with
-different name spaces.  For example:
+use 'init' to set up your Git repository then, before your first 'fetch', edit
+the $GIT_DIR/config file so that the branches and tags are associated
+with different name spaces.  For example:
 
         branches = stable/*:refs/remotes/svn/stable/*
@@ -880 +1012 @@
 properties are logged to $GIT_DIR/svn/<refname>/unhandled.log
 
-Renamed and copied directories are not detected by git and hence not
+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
+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.
+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/'.
 
 CONFIGURATION
@@ -891 +1029 @@
 
 'git svn' stores [svn-remote] configuration information in the
-repository .git/config file.  It is similar the core git
+repository $GIT_DIR/config file.  It is similar the core Git
 [remote] sections except 'fetch' keys do not accept glob
 arguments; but they are instead handled by the 'branches'
@@ -920 +1058 @@
         url = http://server.org/svn
         fetch = trunk/src:refs/remotes/trunk
-        branches = branches/{red,green}/src:refs/remotes/branches/*
-        tags = tags/{1.0,2.0}/src:refs/remotes/tags/*
+        branches = branches/{red,green}/src:refs/remotes/project-a/branches/*
+        tags = tags/{1.0,2.0}/src:refs/remotes/project-a/tags/*
+------------------------------------------------------------------------
+
+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/*
+------------------------------------------------------------------------
+
+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
 ------------------------------------------------------------------------
 
 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
-fetching, then .git/svn/.metadata must be manually edited to remove (or
-reset) branches-maxRev and/or tags-maxRev as appropriate.
+fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove
+(or reset) branches-maxRev and/or tags-maxRev as appropriate.
+
+FILES
+-----
+$GIT_DIR/svn/\*\*/.rev_map.*::
+        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.
 
 SEE ALSO