chiark / gitweb /
git-debrebase: Merge: Make a todo about gbp not round tripping
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 19 Aug 2018 19:45:19 +0000 (20:45 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 19 Aug 2018 20:14:39 +0000 (21:14 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index 706af54..3be444b 100755 (executable)
@@ -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