dgit: --deliberately-not-fast-forward works properly in split view quilt modes (suppr...

diff --git a/debian/changelog b/debian/changelog
index 9d192d275229722522b0f4c11be3af72b6f80b59..4e4402164dfc69202aee00516bdbfa173c1256fb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (4.0~) experimental; urgency=low
 
 dgit (4.0~) experimental; urgency=low
 

-  * 
+  * dgit: --deliberately-not-fast-forward works properly in
+    split view quilt modes (suppressing the pseudomerge).

 
  --
 
 
  --
 

diff --git a/dgit b/dgit
index 6b1201e7aee73dbc46cdcaa89b3c0b72987f49ce..caa2d75ce85e3ac3592d77a8eae47fa16b8213e7 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3891,6 +3891,7 @@ sub splitbrain_pseudomerge ($$$$) {
     #
 
     return $dgitview unless defined $archive_hash;
     #
 
     return $dgitview unless defined $archive_hash;

+    return $dgitview if deliberately_not_fast_forward();

 
     printdebug "splitbrain_pseudomerge...\n";
 
 
     printdebug "splitbrain_pseudomerge...\n";
 

diff --git a/dgit.1 b/dgit.1
index e5b4bb050b6145a30a72299733622b768677c125..2233d95941fa34f9ec4ac9e9a4a77c25f77cda34 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -554,6 +554,17 @@ Declare that you are deliberately rewinding history.  When pushing to
 Debian, use this when you are making a renewed upload of an entirely
 new source package whose previous version was not accepted for release
 from NEW because of problems with copyright or redistributibility.
 Debian, use this when you are making a renewed upload of an entirely
 new source package whose previous version was not accepted for release
 from NEW because of problems with copyright or redistributibility.

+
+In split view quilt modes,
+this also prevents the construction by dgit of a pseudomerge
+to make the dgit view fast forwarding.
+Normally only one of
+--overwrite (which creates a suitable pseudomerge)
+and
+--deliberately-not-fast-forward
+(which suppresses the pseudomerge and the fast forward checks)
+should be needed;
+--overwrite is usually better.

 .TP
 .BR --deliberately-include-questionable-history
 Declare that you are deliberately including, in the git history of
 .TP
 .BR --deliberately-include-questionable-history
 Declare that you are deliberately including, in the git history of