Split brain: TODOs

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

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 745147689aa14f16c6b745ae6c7570ed22f8e4b0..b526d213b4b043fe7a1c2d5f11bb13c1044e3055 100644 (file)
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -13,6 +13,15 @@ Tag rename unfinished business
 
  - other tag should be [dgit Maintainer-Tag quilt=$quilt-mode]
 
 
  - other tag should be [dgit Maintainer-Tag quilt=$quilt-mode]
 

+ - in dopush (?), we need to sort out synthetic fast forard
+    this should not depend entirely on quilt mode
+    but will always be needed if quiltmode_splitbrain
+
+ - there is some confusion between $split_brain (did we actually
+   generate any commits) and quiltmode_splitbrain (might we have done,
+   including in previous pushes); search for $split_brain and check
+   that use sites are correct
+

 
 Want tests for
  - start repo with old tag, push with new tag, run
 
 Want tests for
  - start repo with old tag, push with new tag, run

diff --git a/dgit b/dgit
index 288fc78deabf983970c5a3be740e9032deb834ef..53ccd724b821a9dcd59355f08011ff804f4951d7 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2148,8 +2148,6 @@ END
        }
     }
 
        }
     }
 

-    die 'xxx fast forward (should not depend on quilt mode, but will always be needed if we did $split_brain)' if $split_brain;
-

     check_not_dirty();
     changedir $ud;
     progress "checking that $dscfn corresponds to HEAD";
     check_not_dirty();
     changedir $ud;
     progress "checking that $dscfn corresponds to HEAD";

diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp
index d3624e9ee6f5183350b10a586c3beab2724513b1..da27d1447ca969eb702267cdc4e06033a849ccca 100755 (executable)
--- a/tests/tests/quilt-gbp
+++ b/tests/tests/quilt-gbp
@@ -30,7 +30,8 @@ exit 0
 want to
 
  do push
 want to
 
  do push

- t-pushed-good
+ t-pushed-good XXX need to do something more subtle than check our branch is in repo now
+

  check that
    - we didn't update caller's branch
 
  check that
    - we didn't update caller's branch
 


@@ -44,3 +45,8 @@ want to
   - has patches applied (reuse rules build magic)
   - has .gitignore edited
 
   - has patches applied (reuse rules build magic)
   - has .gitignore edited
 

+make a new change
+
+push it
+
+check that the synthetic fast forward worked