[PATCH v3 00/11] saving and replaying multiple variants with rerere

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 6, 2016, 23:05 UTC
Message-ID: <1459983935-25267-1-git-send-email-gitster@pobox.com>
In-Reply-To: <1459204942-26601-1-git-send-email-gitster@pobox.com>

This adds only finishing touches compared to the previous one, which starts at the message this is a response to and is found at http://thread.gmane.org/gmane.comp.version-control.git/290068.

Namely, the last patch is different in that it not just adjusts 'forget', but also has a new test for 'rerere forget'.

Junio C Hamano (11):
  rerere: split conflict ID further
  rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
  rerere: handle leftover rr-cache/$ID directory and postimage files
  rerere: delay the recording of preimage
  rerere: allow multiple variants to exist
  t4200: rerere a merge with two identical conflicts
  rerere: do use multiple variants
  rerere: gc and clear
  rerere: move code related to "forget" together
  rerere: split code to call ll_merge() further
  rerere: adjust 'forget' to multi-variant world order

 rerere.c          | 626 +++++++++++++++++++++++++++++++++++++-----------------
 rerere.h          |   4 +-
 t/t4200-rerere.sh | 170 ++++++++++++++-
 3 files changed, 604 insertions(+), 196 deletions(-)

-- 
2.8.1-273-ga2cd0f9


 t/t4200-rerere.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 647ea6f..1a080e7 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -477,6 +477,7 @@ test_expect_success 'multiple identical conflicts' '
 	merge_conflict_resolve &&
 
 	# Check that rerere knows that file1 and file2 have conflicts
+
 	printf "%s\n" file1 file2 >expect &&
 	git ls-files -u | sed -e "s/^.*	//" | sort -u >actual &&
 	test_cmp expect actual &&
@@ -535,7 +536,17 @@ test_expect_success 'multiple identical conflicts' '
 	test_cmp file1.expect file1 &&
 	test_cmp file2.expect file2 &&
 
-	# Pretend again
+	# Forget resolution for file2
+	git rerere forget file2 &&
+	echo file2 >expect &&
+	git rerere status >actual &&
+	test_cmp expect actual &&
+	count_pre_post 2 1 &&
+
+	# file2 already has correct resolution, so record it again
+	git rerere &&
+
+	# Pretend that the resolutions are old again
 	find .git/rr-cache/ -type f | xargs test-chmtime -172800 &&
 
 	# Resolved entries have not expired yet