diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2018-10-27 13:40:26 -0700 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-11-08 00:41:36 +0000 |
commit | 737e066cf48706a00da9d65d0ee026fef0771a8b (patch) | |
tree | 8c17059fccb6118a271324198ec798246b10dd68 | |
parent | e1026645bc6576b9b0f4c20e59b5f785c125aff2 (diff) |
dgit-maint-debrebase(7): account for case discussed in #903377
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r-- | dgit-maint-debrebase.7.pod | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index e5abe17..e3d557a 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -269,6 +269,11 @@ patches applied. Use =back +If you were not previously using dgit to upload your package (i.e. you +were not using the workflow described in dgit-maint-gbp(7)), and you +happen to have run B<dgit fetch sid> in this clone of the repository, +you will need to pass I<--fdiverged> to this command. + =item (C) There is a delta queue, and patches are applied. Use @@ -442,6 +447,12 @@ cowbuilder>. Upload with B<dgit push> or B<dgit push-source>. Remember to pass I<--new> if the package is new in the target suite. +In some cases where you used B<git debrebase convert-from-gbp> since +the last upload, it is not possible for dgit to make your history +fast-forwarding from the history on B<dgit-repos>. In such cases you +will require I<--overwrite>. Try pushing without this option first, +and then dgit will suggest using it if it is needed. + Right before uploading, if you did not just already do so, you might want to have git-debrebase(1) shuffle your branch such that the Debian delta queue appears right at the tip of the branch you will push: |