diff options
Diffstat (limited to 'dgit-maint-merge.7.pod')
| -rw-r--r-- | dgit-maint-merge.7.pod | 16 |
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 --- 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<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 -branches: +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>: =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<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. +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. Then, either |