diff options
| author | Bryan Jacobs <bjacobs@woti.com> | 2011-09-07 17:36:05 (GMT) |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2011-09-13 08:12:13 (GMT) |
| commit | 1e5814f3def08452aef4caa703f074ba7d167867 (patch) | |
| tree | 4d4d43de6777ca1c592e6a95580855f34bc47a13 /Documentation/git-svn.txt | |
| parent | 5738c9c21e53356ab5020912116e7f82fd2d428f (diff) | |
| download | git-1e5814f3def08452aef4caa703f074ba7d167867.zip git-1e5814f3def08452aef4caa703f074ba7d167867.tar.gz git-1e5814f3def08452aef4caa703f074ba7d167867.tar.bz2 | |
git-svn: teach git-svn to populate svn:mergeinfo
Allow git-svn to populate the svn:mergeinfo property automatically in
a narrow range of circumstances. Specifically, when dcommitting a
revision with multiple parents, all but (potentially) the first of
which have been committed to SVN in the same repository as the target
of the dcommit.
In this case, the merge info is the union of that given by each of the
parents, plus all changes introduced to the first parent by the other
parents.
In all other cases where a revision to be committed has multiple
parents, cause "git svn dcommit" to raise an error rather than
completing the commit and potentially losing history information in
the upstream SVN repository.
This behavior is disabled by default, and can be enabled by setting
the svn.pushmergeinfo config option.
[ew: minor style changes and manpage merge fix]
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Bryan Jacobs <bjacobs@woti.com>
Diffstat (limited to 'Documentation/git-svn.txt')
| -rw-r--r-- | Documentation/git-svn.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index e75fc19..08cad6d 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -225,6 +225,14 @@ discouraged. 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"`) ++ +[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. 'branch':: Create a branch in the SVN repository. |