|author||Sean Whitton <email@example.com>||2017-11-25 17:23:07 -0700|
|committer||Ian Jackson <firstname.lastname@example.org>||2018-01-06 01:24:14 +0000|
dgit-maint-merge(7): Mandate pushing upstream branch to alioth
In the case where we are using gbp-import-orig(1) to maintain a virtual upstream branch, we must push that branch somewhere. It is needed whenever we import a new upstream release. Thanks to Johannes Schauer for pointing out that the manpage previously said that pushing to alioth is always optional. Signed-off-by: Sean Whitton <email@example.com>
1 files changed, 9 insertions, 7 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index ed7cdc0..cb9fe4e 100644
@@ -171,12 +171,9 @@ Then we can import the upstream version:
-You are now ready to proceed as above, making commits to both the
-upstream source and the I<debian/> directory.
-If you want to maintain a copy of your repository on
-B<alioth.debian.org>, you should push both the origin and the upstream
+Our upstream branch cannot be pushed to B<dgit-repos>, but since we
+will need it whenever we import a new upstream version, we must push
+it somewhere. The usual choice is B<alioth.debian.org>:
@@ -185,6 +182,9 @@ branches:
+You are now ready to proceed as above, making commits to both the
+upstream source and the I<debian/> directory.
=head1 CONVERTING AN EXISTING PACKAGE
This section explains how to convert an existing Debian package to
@@ -322,7 +322,9 @@ to git), you can just run dpkg-buildpackage(1) or debuild(1) instead.
=head3 When upstream releases only tarballs
You will need the I<debian/gbp.conf> from "When upstream releases only
+tarballs", above. You will also need your upstream branch. Above, we
+pushed this to B<alioth.debian.org>. You will need to clone or fetch
+from there, instead of relying on B<dgit clone>/B<dgit fetch> alone.