summaryrefslogtreecommitdiff
path: root/TODO.BRANCH
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-25 14:48:41 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-26 01:36:22 +0100
commit6a009a8fe0fa46c0d92d51300566c7afcf21ed2e (patch)
tree294b6334976cf711fe5eda17162a11fc18fbf402 /TODO.BRANCH
parent9103f4a18a893971b6ab8fab4c1ac4c98729eecb (diff)
Overwrite: Provide --overwrite=VERSION option
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'TODO.BRANCH')
-rw-r--r--TODO.BRANCH10
1 files changed, 0 insertions, 10 deletions
diff --git a/TODO.BRANCH b/TODO.BRANCH
index 7d39b29..141a3aa 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,14 +1,4 @@
- - 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
-
- We want a --overwrite=VERSION option which 1. adjusts
- the version used above, and 2. does the same thing in any
- quilt mode. If no split brain it should make the pseudomerge
- on the user's HEAD.
-
-
SPLIT BRAIN
* Check archive allegedly supports split brain mode before running