Split brain: Document the plan

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 4283a27574020c2e32fe7fd0fb6a04a363af8435..b5082c96360439d98f6d9cae560f9db0d2954fc3 100755 (executable)
--- 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 $!;