diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-11-08 23:00:15 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-16 16:47:46 +0100 |
commit | 3b69b271b727db4bdb9120c9306ffb361c3bebba (patch) | |
tree | 1f0fe9833ae0955dc191e2fbe92885852167e29d /dgit | |
parent | 1ad50a40447cf930bde69ee6b0a21b6d35c15104 (diff) |
Split brain: Document the plan
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -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 $!; |