X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=2cbb2fdf36dc825559a6eac2b049eb360d78d693;hp=3b847d7e6c649cd60d4502714c57d0eaa4f831dd;hb=5dfc6a96cc69cd63ba7ff3be90d909391cf717b3;hpb=7c135b780c03d0d5abbcf7fec65062e84e68c551

diff --git a/dgit b/dgit
index 3b847d7e..2cbb2fdf 100755
--- a/dgit
+++ b/dgit
@@ -2896,23 +2896,32 @@ sub splitbrain_pseudomerge ($$$$) {
 
     return $dgitview if is_fast_fwd $archive_hash, $dgitview;
 
-    my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_basedistro;
-    my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
-    my $t_dgit = debiantag_new $i_arch_v->[0], access_basedistro;
-    my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
-    my $i_archive = [ $archive_hash, "current archive contents" ];
-
-    printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
-
-    infopair_cond_equal($i_dgit, $i_archive);
-    infopair_cond_ff($i_dep14, $i_dgit);
-    $overwrite_version // infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
+    if (defined $overwrite_version) {
+    } elsif (!eval {
+	my $t_dep14 = debiantag_maintview $i_arch_v->[0], access_basedistro;
+	my $i_dep14 = infopair_lrf_tag_lookup($t_dep14, "maintainer view tag");
+	my $t_dgit = debiantag_new $i_arch_v->[0], access_basedistro;
+	my $i_dgit = infopair_lrf_tag_lookup($t_dgit, "dgit view tag");
+	my $i_archive = [ $archive_hash, "current archive contents" ];
+
+	printdebug "splitbrain_pseudomerge i_archive @$i_archive\n";
+
+	infopair_cond_equal($i_dgit, $i_archive);
+	infopair_cond_ff($i_dep14, $i_dgit);
+	infopair_cond_ff($i_dep14, [ $maintview, 'HEAD' ]);
+	1;
+    }) {
+	print STDERR <<END;
+$us: check failed (maybe --overwrite is needed, consult documentation)
+END
+	die "$@";
+    }
 
     my $r = pseudomerge_make_commit
 	$clogp, $dgitview, $archive_hash, $i_arch_v,
 	"dgit --quilt=$quilt_mode",
 	(defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
-Declare fast forward from $overwrite_version
+Declare fast forward from $i_arch_v->[0]
 END_OVERWR
 Make fast forward from $i_arch_v->[0]
 END_MAKEFF