summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-19 18:28:26 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-20 20:06:44 +0100
commitf4abf9e82d21a452741f53bd0ca67c1b087908d4 (patch)
tree8be54f76c0da0ade2149a7f8abdf15fc4043fc44
parent1cc88d94aef2a09baa3f0cbeb1a1c652f639523b (diff)
dgit-maint-merge(7): Mention what to do if upstream make good tarballs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--dgit-maint-merge.7.pod10
1 files changed, 10 insertions, 0 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 6d0db99..7391daf 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -52,6 +52,16 @@ compress orig tarballs:
=head1 INITIAL DEBIANISATION
+=head2 When upstream tags releases in git and releases identical tarballs
+
+Ideally upstream would make git tags, and tarball releases, which are
+completely identical to each other. If this is the case then you can
+use the upstream tarballs directly.
+
+If you're not sure, use the procedure below under "When upstream
+releases only tarballs" only with a different upstream tag name. Then
+use git diff to check that there are no differences.
+
=head2 When upstream tags releases in git
Suppose that the latest stable upstream release is 1.2.2, and this has