chiark / gitweb /
dgit-maint-merge(7): Configure --merge-mode for gbp-import-orig(1)
authorSean Whitton <spwhitton@spwhitton.name>
Sat, 25 Nov 2017 23:56:14 +0000 (16:56 -0700)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 6 Jan 2018 01:23:54 +0000 (01:23 +0000)
For 3.0 (quilt) source packages, gbp-import-orig(1) defaults to
--merge-mode=replace, which does the wrong thing for patches-applied
repositories (see gbp-import-orig(1)).

Note that we do override this when importing the first upstream
version.  This is needed because git-merge(1) will refuse to merge
unrelated histories.

Thanks to Johannes Schauer for reporting the problem.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-merge.7.pod

index 995fe8b..fe48609 100644 (file)
@@ -146,6 +146,9 @@ Now create I<debian/gbp.conf>:
     pristine-tar = False
     pristine-tar-commit = False
 
+    [import-orig]
+    merge-mode = merge
+
 =back
 
 gbp-import-orig(1) requires a pre-existing upstream branch: