我正在尝试在较旧的subversion存储库之上使用git。我们有多个用户正在使用新的git remote（origin / master），这是旧版repo的git svn克隆。问题是当我们执行git svn dcommit以将更改从新的git repo推送到旧的subversion repo时，提交者的用户名将丢失，而是由git svn clone'd用户的信息替换。有没有办法在dcommit上将提交者的信息保存到subversion中？
答案 0 :(得分：5)
您可以将git-svn与--add-author-from和--use-log-author一起使用。前者代表提交消息中From:行的git作者，后者执行反向转换。
那就是repository formats matter，而subversion存储库格式比git一样差。它不支持合并，或者提交者与作者或提交时间不同于推送时间。 git-svn可以在本地获取git ui，但它对数据模型无能为力。希望你能够迁移到git存储库，可能还有一个svn前端（现在有git-svnserver和github的闭源选项）。
答案 1 :(得分：1)
我知道这是一个非常古老的话题，但如果有人有兴趣我将这个黑客添加到我的本地git-svn副本中：
23a24
> use POSIX qw/strftime/;
984a986
> my $ra = Git::SVN::Ra->new($url);
987c989
< ra => Git::SVN::Ra->new($url),
---
> ra => $ra,
995a998,1014
> my $cmt_author = get_commit_entry($d)->{author};
> my $cmt_date = get_commit_entry($d)->{date};
> if ( defined $cmt_author ) {
> foreach my $key ( keys %users ) {
> my $i = index($cmt_author, $users{$key}[1]);
> if ( $i != -1 ) {
> print "Changed author to $key\n";
> $ra->change_rev_prop($cmt_rev, 'svn:author', $key);
> last;
> }
> }
> }
> if ( defined $cmt_date ) {
> $cmt_date = strftime("%Y-%m-%dT%H:%M:%S.000000Z", gmtime($cmt_date));
> print "Changed date to $cmt_date\n";
> $ra->change_rev_prop($cmt_rev, 'svn:date', $cmt_date);
> }
1758c1777
< my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
---
> my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish), author => undef, date => undef );
1768a1788
> my $date;
1774c1794,1797
< $author = $1 if (/^author (.*>)/);
---
> if (/^author (.*>) (\d+) ([\-\+]?\d+)$/o) {
> $author = $1;
> $date = Git::SVN::Log::parse_git_date($2, $3);
> }
1792a1816,1817
> $log_entry{author} = $author || undef;
> $log_entry{date} = $date || undef;
这是针对1.9.1-1（Ubuntu 14.04上的deb软件包版本）。它是不可配置的，因为如果您有一个users.txt文件，它将使用它，它将始终尝试设置日期。此外，如果您有一个给定git用户的多个SVN帐户，它只会选择一个。
我只是刚开始用它来生气，但我认为它可能会起作用，手指交叉！
此致 亚当
答案 2 :(得分：1)
我修改了Adam Sutton提议的补丁，以便git svn dcommit接受--commit-author选项：
--- ./git-svn.orig 2014-10-09 23:11:40.032767542 +0300
+++ ./git-svn 2014-10-09 23:27:58.252753020 +0300
@@ -116,7 +116,7 @@
$_before, $_after,
$_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local,
$_prefix, $_no_checkout, $_url, $_verbose,
- $_commit_url, $_tag, $_merge_info, $_interactive);
+ $_commit_url, $_commit_author, $_tag, $_merge_info, $_interactive);
# This is a refactoring artifact so Git::SVN can get at this git-svn switch.
sub opt_prefix { return $_prefix || '' }
@@ -194,6 +194,7 @@
'dry-run|n' => \$_dry_run,
'fetch-all|all' => \$_fetch_all,
'commit-url=s' => \$_commit_url,
+ 'commit-author=s' => \$_commit_author,
'revision|r=i' => \$_revision,
'no-rebase' => \$_no_rebase,
'mergeinfo=s' => \$_merge_info,
@@ -982,6 +983,7 @@
$rewritten_parent);
}
+ my $ra = Git::SVN::Ra->new($url);
my %ed_opts = ( r => $last_rev,
log => get_commit_entry($d)->{log},
ra => $ra,
@@ -993,6 +995,10 @@
editor_cb => sub {
print "Committed r$_[0]\n";
$cmt_rev = $_[0];
+ if (defined($_commit_author)) {
+ print "Changed author to $_commit_author\n";
+ $ra->change_rev_prop($cmt_rev, 'svn:author', $_commit_author);
+ }
},
mergeinfo => $_merge_info,
svn_path => '');
@@ -1790,6 +1796,7 @@
}
print $log_fh $msgbuf or croak $!;
command_close_pipe($msg_fh, $ctx);
+ $log_entry{author} = $author || undef;
}
close $log_fh or croak $!;
答案 3 :(得分：0)
要求每个人在每次提交的消息中使用“签名关闭”或其他方式将其用户名包括在内。这是一个非常丑陋的解决方案，但AFAIK是唯一能够在不攻击git-svn源的情况下完成的事情。
答案 4 :(得分：0)
这是Adam Sutton的另一个稍微修改过的版本 它从authors文件创建一个反向映射，并对重复和/或缺失的作者进行一些额外的检查。 它还告诉您输入哪个Git用户被映射到每个提交的哪个SVN用户，即使在运行git svn dcommit --dry-run时也是如此。
[root@qa-travel-centos git-svn-bridge]# diff scripts/git-svn.orig scripts/git-svn.hacked
23a24
> use POSIX;
963a965,975
>
> #Revert the keys/values from authors into a reverse map.
> #If a duplicate is found(i.e. 2 git users matching 1 svn user) abort the operation.
> my %rev_author_map;
> while (my ($key, @value) = each %users) {
> my $rev_key="$value[0][0] <$value[0][1]>";
> if(exists $rev_author_map{$rev_key}) {
> fatal "Found a duplicate GIT author($rev_key) in the authorsfile. Aborting dcommit!"
> }
> $rev_author_map{$rev_key}=$key
> }
972a985,997
> my $commit_entry = get_commit_entry($d);
> my $cmt_author = $commit_entry->{author};
> my $cmt_date = $commit_entry->{date};
> print "GIT AUTHOR: $cmt_author; \n";
> if(defined $cmt_author) {
> my $svn_author = $rev_author_map{$cmt_author};
> #Here we check if the git commit author matches an author in the authorsfile
> if ((not (defined $svn_author)) || $svn_author eq "") {
> fatal "The git author: $cmt_author was not found in the authors file. Make sure you have commited as a user listed in the authors file. Note:matching is case sensitive.";
> }
> print "SVN AUTHOR: $svn_author\n";
> }
>
984c1009
<
---
> my $ra = Git::SVN::Ra->new($url);
987c1012
< ra => Git::SVN::Ra->new($url),
---
> ra => $ra,
995a1021,1032
> #Here we coerce SVN into accepting the correct user according to the reverse mapping.
> if(defined $cmt_author) {
> my $svn_author = $rev_author_map{$cmt_author};
> print "SVN AUTHOR: $svn_author\n";
> $ra->change_rev_prop($cmt_rev, 'svn:author', $svn_author)
> }
> #Here we coerce SVN into accepting the commit date from Git.
> if ( defined $cmt_date ) {
> $cmt_date = strftime("%Y-%m-%dT%H:%M:%S.000000Z", gmtime($cmt_date));
> print "SVN DATE SET TO: $cmt_date\n";
> $ra->change_rev_prop($cmt_rev, 'svn:date', $cmt_date);
> }
1748c1785
< my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish) );
---
> my %log_entry = ( log => '', tree => get_tree_from_treeish($treeish), author =>undef, date => undef );
1758a1796
> my $date;
1764c1802,1805
< $author = $1 if (/^author (.*>)/);
---
> if(/^author (.*>) (\d+) ([\-\+]?\d+)$/o){
> $author = $1;
> $date = $2;
> }
1782a1824,1825
> $log_entry{author} = $author || undef;
> $log_entry{date} = $date || undef;
答案 5 :(得分：-1)
Github像往常一样救援！他们对git svn的快速概述进入了用户映射：http://help.github.com/svn-importing/
基本上，您创建一个包含所需映射的文件。