control: tag -1 +patch
control: severity -1 minor

Hello Michael,

Firstly, let me note that you didn't finish following the instructions.
You're meant to follow the "Source package configuration" section after
following either "Initial Debianisation" or "Converting an existing
package".  That's why "Source package configuration" comes before the
instructions to use `dgit build-source`.

That wouldn't fix the missing orig.tar, though.  The issue is that the
manpage assumes that you already have the repository cloned and have
been using it with another workflow, in which case you'd already have
the orig.tar present.

The attached patch adds a few commands to handle your case.

On Fri, Oct 13 2017, Michael Stapelberg wrote:

> Could a check for the orig tarball be added to “dgit build-source”?
> The current dpkg-source message is confusing: [...]

I think it makes more sense to improve this error message in
dpkg-source, rather than working around it in dgit.

-- 
Sean Whitton

From b850304d55df5d4948cef43dcd3d5439adf9a7e4 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhit...@spwhitton.name>
Date: Fri, 13 Oct 2017 14:08:51 -0700
Subject: [PATCH] dgit-maint-merge(7): Include instructions to clone existing
 repo

Signed-off-by: Sean Whitton <spwhit...@spwhitton.name>
---
 dgit-maint-merge.7.pod | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 3da1b78..ffece64 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -188,7 +188,16 @@ this workflow.  It should be skipped when debianising a new package.
 
 =head2 Existing git history using another workflow
 
-First, dump any existing patch queue:
+First, if you don't already have the git history locally, clone it,
+and obtain the corresponding orig.tar from the archive:
+
+=over 4
+
+    % git clone git.debian.org:collab-maint/foo
+    % cd foo
+    % origtargz
+
+Now dump any existing patch queue:
 
 =over 4
 
-- 
2.14.2

Attachment: signature.asc
Description: PGP signature

Reply via email to