summaryrefslogtreecommitdiff
path: root/TODO.BRANCH
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-11-19 00:32:00 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:47 +0100
commitb83b6f62fc7c4b473c7228b1293619389b284c5f (patch)
treee14c3ee46aa026a96bc05523a481c8c7aa72fb5f /TODO.BRANCH
parentbd5e99ad04dc4eda140aca37840628118d1fa94d (diff)
Split brain: Start work on determining split brain necessity
`Split brain' means the situation where `dgit push' makes private commits, to push to the dgit repos server, which are not left on the user's actual branch. Check whether the quilt mode and tree differences, taken together, mean that we need split brain. If we do need split brain, use gbp pq to apply the patch series. .gitignore changes are mishandled, still. And we don't actually follow through much yet. Also, fix a case where quilt mode `apply' hadn't been changed to `unapplied'.
Diffstat (limited to 'TODO.BRANCH')
-rw-r--r--TODO.BRANCH2
1 files changed, 2 insertions, 0 deletions
diff --git a/TODO.BRANCH b/TODO.BRANCH
new file mode 100644
index 0000000..c152522
--- /dev/null
+++ b/TODO.BRANCH
@@ -0,0 +1,2 @@
+Provide --gpbpq[=:] options
+Document --quilt=unapplied|gbp|dpm