On Fri, Jun 16, 2017 at 01:07:04PM +0100, Sean Whitton wrote: > Here's a patch, though I think we need to wait for #864881.
Here is an updated patch taking into account the gbp maintainer's resolution of #864881. -- Sean Whitton
From 67f873d2af6e58e6376e2a14607bbf1901fded00 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 | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 3da1b78..ceecc9f 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -148,12 +148,23 @@ 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"
- % gbp import-orig ../foo_1.2.2.orig.tar.xz
+ % 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 --merge-mode=replace ../foo_1.2.2.orig.tar.xz
=back
--
2.11.0
signature.asc
Description: PGP signature
