The previous behavior would only generate mergeinfo once using the first
commit, and use that mergeinfo for all remaining commits. The new behavior will
generate it once for every commit.
---
git-svn.perl | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 7349ffe..9ddeaf4 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -974,8 +974,12 @@ sub cmd_dcommit {
} else {
my $cmt_rev;
- unless (defined($_merge_info) || ! $push_merge_info) {
- $_merge_info = populate_merge_info($d, $gs,
+ my $rev_merge_info;
+ if (defined($_merge_info)) {
+ $rev_merge_info = $_merge_info;
+ }
+ unless (defined($rev_merge_info) || ! $push_merge_info)
{
+ $rev_merge_info = populate_merge_info($d, $gs,
$uuid,
$linear_refs,
$rewritten_parent);
@@ -993,7 +997,7 @@ sub cmd_dcommit {
print "Committed r$_[0]\n";
$cmt_rev = $_[0];
},
- mergeinfo => $_merge_info,
+ mergeinfo => $rev_merge_info,
svn_path => '');
my $err_handler = $SVN::Error::handler;
--
1.8.5.rc3.5.g96ccada
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
