diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-31 19:02:32 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-05 13:41:48 +0100 |
commit | 5a25026a936fed50c4ad1dd06b5fc57f3fe9c2c0 (patch) | |
tree | 8c9c1ee335a970f893cec9ca8d9cd8b1ae9e07af | |
parent | 626570adb7708d465460d236c9da1b82a23c22b4 (diff) |
Split brain: TODOs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | TODO.BRANCH | 9 | ||||
-rwxr-xr-x | dgit | 2 | ||||
-rwxr-xr-x | tests/tests/quilt-gbp | 8 |
3 files changed, 16 insertions, 3 deletions
diff --git a/TODO.BRANCH b/TODO.BRANCH index 7451476..b526d21 100644 --- a/TODO.BRANCH +++ b/TODO.BRANCH @@ -13,6 +13,15 @@ Tag rename unfinished business - 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 @@ -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"; diff --git a/tests/tests/quilt-gbp b/tests/tests/quilt-gbp index d3624e9..da27d14 100755 --- a/tests/tests/quilt-gbp +++ b/tests/tests/quilt-gbp @@ -30,7 +30,8 @@ exit 0 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 @@ -44,3 +45,8 @@ want to - has patches applied (reuse rules build magic) - has .gitignore edited +make a new change + +push it + +check that the synthetic fast forward worked |