From 3b69b271b727db4bdb9120c9306ffb361c3bebba Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 8 Nov 2015 23:00:15 +0000 Subject: [PATCH] Split brain: Document the plan --- dgit | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dgit b/dgit index 4283a275..b5082c96 100755 --- a/dgit +++ b/dgit @@ -2882,6 +2882,18 @@ sub quilt_fixup_multipatch ($$$) { # 5. If we had a .pc in-tree, delete it, and git-commit # 6. Back in the main tree, fast forward to the new HEAD + # Another situation we may have to cope with is gbp-style + # patches-unapplied trees. We want to detect these, so we know + # to escape into quilt_fixup_gbp. + # + # A gbp-style tree is one which is not a clean patches-applied + # tree, but _is_ a clean patches-unapplied tree. + # + # To help detect this, when we are extracting the fake dsc, we + # first extract it with --skip-patches, and then apply the patches + # afterwards with dpkg-source --before-build. That lets us save a + # tree object corresponding to .origs. + my $fakeversion="$upstreamversion-~~DGITFAKE"; my $fakedsc=new IO::File 'fake.dsc', '>' or die $!; -- 2.30.2