summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO.BRANCH7
-rwxr-xr-xdgit10
2 files changed, 10 insertions, 7 deletions
diff --git a/TODO.BRANCH b/TODO.BRANCH
index 141a3aa..f5261ed 100644
--- 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 5a37363..0cf854d 100755
--- 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');