summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit10
1 files changed, 9 insertions, 1 deletions
diff --git a/dgit b/dgit
index 4804c9b..b035e10 100755
--- a/dgit
+++ b/dgit
@@ -36,6 +36,7 @@ use File::Path;
use File::Spec;
use File::Temp qw(tempdir);
use File::Basename;
+use File::Copy ();
use Dpkg::Version;
use Dpkg::Compression;
use Dpkg::Compression::Process;
@@ -2659,6 +2660,8 @@ END
chomp $@;
progress "warning: $@";
$path = "$absurdity:$path";
+ open T, ">../../absurd-apply-warnings" or die $!;
+ close T or die $!;
progress f_ "%s: trying slow absurd-git-apply...", $us;
rename "../../gbp-pq-output","../../gbp-pq-output.0"
or $!==ENOENT
@@ -2693,6 +2696,11 @@ gbp-pq import and dpkg-source disagree!
dpkg-source --before-build gave tree %s
END
$rawimport_hash = $gapplied;
+
+ if ($use_absurd) {
+ File::Copy::copy("../../absurd-apply-warnings", \*STDERR)
+ or die $!;
+ }
};
last unless $@;
}
@@ -4596,7 +4604,7 @@ END
" of the archive's version.\n".
"To overwrite the archive's contents,".
" pass --overwrite[=VERSION].\n".
- "To rewind history, if permitted by the archive,".
+ "To rewrite history, if permitted by the archive,".
" use --deliberately-not-fast-forward.";
}
}