dgit(1): Update BUGS section

[dgit.git] / dgit-nmu-simple.7.pod

diff --git a/dgit-nmu-simple.7.pod b/dgit-nmu-simple.7.pod
index 56b399a6d683aed654ee8217485b9c9043dbfcfe..f1e8543d497c6762c74721382b4eb1be007c732b 100644 (file)
--- a/dgit-nmu-simple.7.pod
+++ b/dgit-nmu-simple.7.pod
@@ -15,7 +15,7 @@ The Debian Developers' Reference has some
 (sometimes questionable) guidance on this.
 
 Conversely, you do not need to know anything
 (sometimes questionable) guidance on this.
 
 Conversely, you do not need to know anything

-about the usual maintainer's workflow.
+about the usual maintainer's git workflow.

 If appropriate, you can work on many different packages,
 making similar changes,
 without worrying about the individual maintainers' git practices.
 If appropriate, you can work on many different packages,
 making similar changes,
 without worrying about the individual maintainers' git practices.


@@ -32,6 +32,10 @@ git practices are
 and 
 consult the appropriate C<dgit-maint-*(7)> workflow tutorial,
 
 and 
 consult the appropriate C<dgit-maint-*(7)> workflow tutorial,
 

+Further,
+note that dgit cannot yet be used
+to upload to the DELAYED queues.
+

 =head1 SUMMARY
 
 =over 4
 =head1 SUMMARY
 
 =over 4


@@ -39,13 +43,14 @@ consult the appropriate C<dgit-maint-*(7)> workflow tutorial,
     % dgit clone glibc jessie
     % cd glibc
     % git am ~/glibc-security-fix.diff
     % dgit clone glibc jessie
     % cd glibc
     % git am ~/glibc-security-fix.diff

-    [ edit debian/changelog to introduce a ~ version, and commit it ]
+    % dch --nmu "Apply upstream's fix for foo bug."
+    % git add debian/changelog && git commit -m"NMU changelog entry"

     % dpkg-buildpackage -uc -b
     [ run your tests ]
     % dpkg-buildpackage -uc -b
     [ run your tests ]

-    [ edit debian/changelog to prepare for release, and commit it ]
+    % dch -r && git add debian/changelog && git commit -m"Finalise NMU"

     % dgit -wgf sbuild -A -c jessie
     [ final tests on generated .debs ]
     % dgit -wgf sbuild -A -c jessie
     [ final tests on generated .debs ]

-    % dgit -wgf push jessie
+    % dgit -wgf [--delayed=5] push jessie

     [ enter your gnupg passphrase as prompted ]
     [ see that push and upload are successful ]
     [ prepare and email NMU diff (git-diff, git-format-patch) ]
     [ enter your gnupg passphrase as prompted ]
     [ see that push and upload are successful ]
     [ prepare and email NMU diff (git-diff, git-format-patch) ]


@@ -103,6 +108,12 @@ tree.
 It also means you don't care about the package clean target,
 which is just as well because many package clean targets are broken.
 
 It also means you don't care about the package clean target,
 which is just as well because many package clean targets are broken.
 

+=head1 UPLOADING TO DELAYED
+
+You can use dgit's I<--delayed> option
+to upload to the DELAYED queue.
+However, you should read the warning about this option in dgit(1).
+

 =head1 SEE ALSO
 
 dgit(1), dgit(7), dgit-maint-*(7)
 =head1 SEE ALSO
 
 dgit(1), dgit(7), dgit-maint-*(7)