This UI is pretty good now, I think, for single-piece upstreams.
For multi-piece ones, which are quite tricky anyway, it is tolerable,
and we it doesn't steal much of the available syntax space. So we
don't need the -v0 any more.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
# * 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.
+# * new-upstream has an awkward 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 -f in
# fairly sensible situations.
=over 4
- % git debrebase new-upstream-v0 1.2.3
+ % git debrebase new-upstream 1.2.3
=back
stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
}
-sub cmd_new_upstream_v0 () {
+sub cmd_new_upstream () {
# automatically and unconditionally launders before rebasing
# if rebase --abort is used, laundering has still been done
You should consider using B<conclude> instead,
because that launders the branch too.
-=item git-debrebase new-upstream-v0 <new-version> [<upstream-details>...]
+=item git-debrebase new-upstream <new-version> [<upstream-details>...]
Rebases the delta queue
onto a new upstream version. In detail:
L<git-archive(1)>, L<dgit(1)> and
L<gbp-import-orig(1)> may be able to help.
-This subcommand has -v0 in its name because we are not yet sure
-that its command line syntax is optimal.
-We may want to introduce an incompatible replacement syntax
-under the name C<new-upstream>.
-
=item git-debrebase make-patches [--quiet-would-amend]
Generate patches in debian/patches/
git checkout master
t-expect-fail F:'Could not determine appropriate upstream commitish' \
-t-git-debrebase new-upstream-v0 $v
+t-git-debrebase new-upstream $v
git tag v2.1 upstream
-t-git-debrebase new-upstream-v0 $v
+t-git-debrebase new-upstream $v
t-gdr-good laundered
t-git-debrebase stitch
exit;
')
-t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream-v0 $v upstream
+t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream $v upstream
t-gdr-good laundered
t-git-debrebase stitch