git-debrebase: Merge: Make a todo about gbp not round tripping

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 706af5425130298c9968fa3b298842db0dd6bf4b..3be444b935e4af4e02a2e50e2e61cbf0230e4b81 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -681,6 +681,8 @@ sub merge_series_patchqueue_convert ($$$) {
        runcmd @git, qw(checkout -q -b mergec), $merged_pq;
 
        merge_attempt_cmd($wrecknotes, qw(gbp pq import));
+       # MERGE-TODO consider git-format-patch etc. instead,
+       # since gbp pq doesn't always round-trip :-/
 
        # OK now we are on patch-queue/merge, and we need to rebase
        # onto the intended parent and drop the patches from each one