control: tag -1 +patch On Fri, Jun 16, 2017 at 10:45:35AM +0200, Johannes Schauer wrote: > currently, when following the dgit-maint-merge man page on how to > debianize a new upstream project that releases tarballs only, one runs > into the following problem: > > % gbp import-orig ../foo_1.2.2.orig.tar.xz > gbp:error: > Repository does not have branch 'upstream' for upstream sources. If there is > none see > file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERT > on howto create it otherwise use --upstream-branch to specify it. > > So the instructions are missing a step that creates the new branch.
Thanks for reporting this. Here's a patch, though I think we need to wait for #864881. -- Sean Whitton
From 630992736677ecbe5343403659d0a184c3da8a62 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhit...@spwhitton.name>
Date: Fri, 16 Jun 2017 13:04:58 +0100
Subject: [PATCH] dgit-maint-merge(7): Create an empty branch for upstream
source
Thanks to Johannes Schauer for finding the problem.
Signed-off-by: Sean Whitton <spwhit...@spwhitton.name>
---
dgit-maint-merge.7.pod | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 3da1b78..620ae2f 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -148,11 +148,22 @@ Now create I<debian/gbp.conf>:
=back
-Then we can import the upstream version:
+gbp-import-orig(1) requires a pre-existing upstream branch:
=over 4
% git add debian/gbp.conf && git commit -m "create gbp.conf"
+ % git checkout --orphan upstream
+ % git rm -rf .
+ % git commit --allow-empty -m "initial, empty branch for upstream source"
+ % git checkout -f master
+
+=back
+
+Then we can import the upstream version:
+
+=over 4
+
% gbp import-orig ../foo_1.2.2.orig.tar.xz
=back
--
2.11.0
signature.asc
Description: PGP signature
