X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-native.7.pod;h=03aee59b361ab3365fd3d9f95a850f00f35c35e4;hp=31da00bc8a417239cac07e2e77b616261d32bfdd;hb=b0bc4d204e5900c7888e681404e2638ce7347cf9;hpb=ee8bb6a7f4f808b5cb798897c0d5995ce1da888d diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod index 31da00bc..03aee59b 100644 --- a/dgit-maint-native.7.pod +++ b/dgit-maint-native.7.pod @@ -4,8 +4,9 @@ dgit - tutorial for package maintainers of Debian-native packages =head1 INTRODUCTION -This document describes elements of a workflow for maintaining a -native Debian package using B. +This document describes elements of a workflow for using B to +maintain a Debian package that uses one of the native source formats +("1.0" & "3.0 (native)"). =over 4 @@ -15,12 +16,16 @@ We expect that your git history is fast-forwarding. =item -You must be prepared to tolerate a small amount of +You should be prepared to tolerate a small amount of ugliness in your git history in the form of merges which stitch the dgit-generated archive view into your maintainer history. +This is to handle uploads that were not made with dgit, +such as the uploads you made before switching to this workflow, +or NMUs. + =back =head2 Benefits