From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 14:52:41 +0000 (+0100)
Subject: git-debrebase: merge: Add a comment about rewriting
X-Git-Tag: archive/debian/6.7~115
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=4d04b76e036b801529fd19a1e45bed0a31a3c8dc

git-debrebase: merge: Add a comment about rewriting

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

diff --git a/git-debrebase b/git-debrebase
index 499cda2e..5de9c14b 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1217,6 +1217,9 @@ sub walk ($;$$$) {
 	    }
 
 	    if ($ok && $might_be_in_bw) {
+		# We could rewrite this to contaion the metadata
+		# declaring it to be MergedBreakwaters, but
+		# unnecessarily rewriting a merge seems unhelpful.
 		$prline->(" VanillaMerge MergedBreakwaters");
 		$last_anchor = $best_anchor;
 		$build_start->('MergedBreakwaters', $cur);