From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Aug 2018 19:45:19 +0000 (+0100)
Subject: git-debrebase: Merge: Make a todo about gbp not round tripping
X-Git-Tag: archive/debian/6.7~23
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d74ea48e54d4bf0902bfe2364cde833d27e40ad8

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

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 706af542..3be444b9 100755
--- 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