Provide --force-changes-origs-exactly

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/dgit b/dgit
index 79618d90400f0a834ddd78a2d92a5005c4102aed..5be5c75bae3ac28fce662351ad930bb1f413ce8c 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -76,7 +76,7 @@ our $tagformatfn;
 
 our %forceopts = map { $_=>0 }
     qw(unrepresentable unsupported-source-format
 
 our %forceopts = map { $_=>0 }
     qw(unrepresentable unsupported-source-format

-       dsc-changes-mismatch
+       dsc-changes-mismatch changes-origs-exactly

        import-gitapply-absurd
        import-gitapply-no-absurd);
 
        import-gitapply-absurd
        import-gitapply-no-absurd);
 


@@ -3453,7 +3453,8 @@ END
 
     # Perhaps adjust .dsc to contain right set of origs
     changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
 
     # Perhaps adjust .dsc to contain right set of origs
     changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,

-                                 $changesfile);
+                                 $changesfile)
+       unless forceing [qw(changes-origs-exactly)];

 
     # Checks complete, we're going to try and go ahead:
 
 
     # Checks complete, we're going to try and go ahead:
 

diff --git a/dgit.1 b/dgit.1
index f7f8dad50b43bf452cf7abee96a8593e285ed925..c5dd6b90dc1d29113bc9ca661ffe4c5f50dd3588 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -744,6 +744,11 @@ dgit thinks that your git tree contains changes
 which dpkg-source is not able to represent.
 Your build or push will probably fail later.
 .TP
 which dpkg-source is not able to represent.
 Your build or push will probably fail later.
 .TP

+.B --force-changes-origs-exactly
+Use the set of .origs specified in your .changes, exactly,
+without regard to what is in the archive already.
+The archive may well reject your upload.
+.TP

 .B --force-unsupported-source-format
 Carry on despite dgit not understanding your source package format.
 dgit will probably mishandle it.
 .B --force-unsupported-source-format
 Carry on despite dgit not understanding your source package format.
 dgit will probably mishandle it.