Closes:#903127.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* dgit, git-debrebase: Properly make patches even if an awkward
.gitignore ignores the things in debian/patches. Closes:#903130.
* git-debrebase status: Fix commit reporting. Closes:903131.
* dgit, git-debrebase: Properly make patches even if an awkward
.gitignore ignores the things in debian/patches. Closes:#903130.
* git-debrebase status: Fix commit reporting. Closes:903131.
+ * git-debrebase new-upstream: Add a -1 revision if the user
+ didn't supply one. Closes:#903127.
* dgit(1): Unscramble push[-source] descriptions. Closes:#903116.
--
* dgit(1): Unscramble push[-source] descriptions. Closes:#903116.
--
badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1;
# parse args - low commitment
badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1;
# parse args - low commitment
- my $new_version = (new Dpkg::Version scalar(shift @ARGV), check => 1);
+ my $spec_version = shift @ARGV;
+ my $new_version = (new Dpkg::Version $spec_version, check => 1);
+ if ($new_version->is_native()) {
+ $new_version = (new Dpkg::Version "$spec_version-1", check => 1);
+ }
my $new_upstream_version = $new_version->version();
my $new_upstream = shift @ARGV;
my $new_upstream_version = $new_version->version();
my $new_upstream = shift @ARGV;
the whole new upstream operation is aborted,
except for the laundering.
the whole new upstream operation is aborted,
except for the laundering.
+<new-version>
+may be whole new Debian version, including revision,
+or just the upstream part,
+in which case -1 will be appended
+to make the new Debian version.
+
The <upstream-details> are, optionally, in order:
=over
The <upstream-details> are, optionally, in order:
=over