Split brain: Check that archive supports "maint", earlier

Otherwise the user will be disappointed shortly.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 141a3aab22f2257a0b2b0f28f6490d1ed48216cc..f5261ed9ada7b5bb2d9c142736dd0faa1967a7f8 100644 (file)
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,11 +1,4 @@
 
-SPLIT BRAIN
-
-  * Check archive allegedly supports split brain mode before running
-    off into the weeds and crashing out in the push.
-
-
-
 OTHER
 
  * Better import format for complex .dscs

diff --git a/dgit b/dgit
index 5a3736302e9732f230b17b0c23a4e4df365547fb..0cf854d3e9b98f48767068cb756be50c64e68b1f 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3696,6 +3696,16 @@ sub build_maybe_quilt_fixup () {
 
     check_for_vendor_patches();
 
+    if (quiltmode_splitbrain) {
+       foreach my $needtf (qw(new maint)) {
+           next if grep { $_ eq $needtf } access_cfg_tagformats;
+           fail <<END
+quilt mode $quilt_mode requires split view so server needs to support
+ both "new" and "maint" tag formats, but config says it doesn't.
+END
+       }
+    }
+
     my $clogp = parsechangelog();
     my $headref = git_rev_parse('HEAD');