From 737e066cf48706a00da9d65d0ee026fef0771a8b Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 27 Oct 2018 13:40:26 -0700 Subject: [PATCH] dgit-maint-debrebase(7): account for case discussed in #903377 Signed-off-by: Sean Whitton --- dgit-maint-debrebase.7.pod | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index e5abe177..e3d557a7 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 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 or B. Remember to pass I<--new> if the package is new in the target suite. +In some cases where you used B since +the last upload, it is not possible for dgit to make your history +fast-forwarding from the history on B. 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: -- 2.30.2