summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-19 01:39:50 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:07:00 +0100
commit21743f5f7c82d130d69fe12ba1faa7ac816e1a68 (patch)
treeef96616236d30cdd51c58ee8c4473f64111aa62d
parent92c9546d19a2e4edf3de98b7487d582237a19ca0 (diff)
git-debrebase: move some todo/notes to NOTES
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--NOTES.git-debrebase50
-rwxr-xr-xgit-debrebase47
2 files changed, 50 insertions, 47 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 7b9a9b1..b7552b7 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -9,6 +9,9 @@ TODO
arrange for dgit to automatically stitch on push
+
+
+
workflow
git-debrebase blah [implies start] strips pseudomerge(s)
@@ -27,6 +30,53 @@ workflow
commit / git-debrebase / etc. strips last pm, but arranges
that remade pm will incorporate it
+
+
+# undocumented usages:
+#
+# git-debrebase [<options>] downstream-rebase-launder-v0 # experimental
+
+# problems / outstanding questions:
+#
+# * dgit push with a `3.0 (quilt)' package means doing quilt
+# fixup. Usually this involves recommitting the whole patch
+# series, one at a time, with dpkg-source --commit. This is
+# terribly terribly slow. (Maybe this should be fixed in dgit.)
+#
+# * dgit push usually needs to (re)make a pseudomerge. The "first"
+# git-debrebase stripped out the previous pseudomerge and could
+# have remembeed the HEAD. But it's not quite clear what history
+# ought to be preserved and what should be discarded. For now
+# the user will have to tell dgit --overwrite.
+#
+# To fix this, do we need a new push hook for dgit ?
+#
+# * Workflow is currently clumsy. Lots of spurious runes to type.
+# There's not even a guide.
+#
+# * new-upstream-v0 has a terrible UI for multiple upstream pieces.
+# You end up with giant runic command lines. Does this matter /
+#
+# One consequence of the lack of richness it can need --force in
+# fairly sensible situations and there is no way to tell it what
+# you are really trying to do, other than just --force. There
+# should be an interface with some default branch names.
+#
+# * There should be a standard convention for the version number,
+# and unfinalised or not changelog, after new-upstream.
+#
+# * Handing of multi-orig dgit new-upstream .dsc imports is known to
+# be broken. They may be not recognised, improperly converted, or
+# their conversion may be unrecognised.
+#
+# * Docs need writing and updating. Even README.git-debrebase
+# describes a design but may not reflect the implementation.
+#
+# * We need to develop a plausible model that works for derivatives,
+# who probably want to maintain their stack on top of Debian's.
+# downstream-rebase-launder-v0 may be a starting point?
+
+
========================================
Theory for ffq-prev
diff --git a/git-debrebase b/git-debrebase
index 75a8f51..9d87e76 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -18,53 +18,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# undocumented usages:
-#
-# git-debrebase [<options>] downstream-rebase-launder-v0 # experimental
-
-# problems / outstanding questions:
-#
-# * dgit push with a `3.0 (quilt)' package means doing quilt
-# fixup. Usually this involves recommitting the whole patch
-# series, one at a time, with dpkg-source --commit. This is
-# terribly terribly slow. (Maybe this should be fixed in dgit.)
-#
-# * dgit push usually needs to (re)make a pseudomerge. The "first"
-# git-debrebase stripped out the previous pseudomerge and could
-# have remembeed the HEAD. But it's not quite clear what history
-# ought to be preserved and what should be discarded. For now
-# the user will have to tell dgit --overwrite.
-#
-# To fix this, do we need a new push hook for dgit ?
-#
-# * Workflow is currently clumsy. Lots of spurious runes to type.
-# There's not even a guide.
-#
-# * There are no tests.
-#
-# * new-upstream-v0 has a terrible UI. You end up with giant
-# runic command lines.
-#
-# One consequence of the lack of richness it can need --force in
-# fairly sensible situations and there is no way to tell it what
-# you are really trying to do, other than just --force. There
-# should be an interface with some default branch names.
-#
-# * There should be a standard convention for the version number,
-# and unfinalised or not changelog, after new-upstream.
-#
-# * Handing of multi-orig dgit new-upstream .dsc imports is known to
-# be broken. They may be not recognised, improperly converted, or
-# their conversion may be unrecognised.
-#
-# * Docs need writing and updating. Even README.git-debrebase
-# describes a design but may not reflect the implementation.
-#
-# * We need to develop a plausible model that works for derivatives,
-# who probably want to maintain their stack on top of Debian's.
-# downstream-rebase-launder-v0 may be a starting point?
-
use strict;
use Debian::Dgit qw(:DEFAULT :playground);