sub resolve_upstream_version ($$) {
my ($new_upstream, $upstream_version) = @_;
sub resolve_upstream_version ($$) {
my ($new_upstream, $upstream_version) = @_;
if (!defined $new_upstream) {
my @tried;
$new_upstream = upstream_commitish_search $upstream_version, \@tried;
if (!defined $new_upstream) {
my @tried;
$new_upstream = upstream_commitish_search $upstream_version, \@tried;
sub cmd_convert_from_gbp () {
badusage __ "want only 1 optional argument, the upstream git commitish"
unless @ARGV<=1;
sub cmd_convert_from_gbp () {
badusage __ "want only 1 optional argument, the upstream git commitish"
unless @ARGV<=1;
resolve_upstream_version($upstream_spec, $upstream_version);
my ($old_head, $gdrlastinfo) = begin_convert_from();
resolve_upstream_version($upstream_spec, $upstream_version);
my ($old_head, $gdrlastinfo) = begin_convert_from();
upstream (%s) and HEAD are not
identical in upstream files. See diffstat above, or run
git diff %s HEAD -- :!/debian :/
upstream (%s) and HEAD are not
identical in upstream files. See diffstat above, or run
git diff %s HEAD -- :!/debian :/
if (length $wrong) {
snag 'unexpected-upstream-changes', f_
"history between upstream (%s) and HEAD contains direct changes to upstream files - are you sure this is a gbp (patches-unapplied) branch?",
if (length $wrong) {
snag 'unexpected-upstream-changes', f_
"history between upstream (%s) and HEAD contains direct changes to upstream files - are you sure this is a gbp (patches-unapplied) branch?",