diff options
| -rwxr-xr-x | dgit | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -2456,7 +2456,8 @@ sub import_tarball_commits ($$) { foreach my $tt (@$tartrees) { printdebug "import tartree $tt->{F} $tt->{Tree}\n"; - my $mbody = f_ "Import %s", $tt->{F}; + # untranslated so that different people's imports are identical + my $mbody = sprintf "Import %s", $tt->{F}; $tt->{Commit} = hash_commit_text($tt->{Orig} ? <<END_O : <<END_T); tree $tt->{Tree} author $r1authline @@ -2694,7 +2695,10 @@ END if ($vcmp < 0) { @output = ($rawimport_mergeinput, $lastpush_mergeinput, { ReverseParents => 1, - Message => (f_ <<END, $package, $cversion, $csuite) }); + # untranslated so that different people's pseudomerges + # are not needlessly different (although they will + # still differ if the series of pulls is different) + Message => (sprintf <<END, $package, $cversion, $csuite) }); Record %s (%s) in archive suite %s END } elsif ($vcmp > 0) { |