From cb9da2c5c7e3c05adb78b682685a0fe0357958e0 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 25 Nov 2017 17:23:07 -0700 Subject: [PATCH] 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 --- dgit-maint-merge.7.pod | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index ed7cdc06..cb9fe4e5 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -171,12 +171,9 @@ Then we can import the upstream version: =back -You are now ready to proceed as above, making commits to both the -upstream source and the I directory. - -If you want to maintain a copy of your repository on -B, you should push both the origin and the upstream -branches: +Our upstream branch cannot be pushed to B, but since we +will need it whenever we import a new upstream version, we must push +it somewhere. The usual choice is B: =over 4 @@ -185,6 +182,9 @@ branches: =back +You are now ready to proceed as above, making commits to both the +upstream source and the I 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 from "When upstream releases only -tarballs", above. +tarballs", above. You will also need your upstream branch. Above, we +pushed this to B. You will need to clone or fetch +from there, instead of relying on B/B alone. Then, either -- 2.30.2