git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCHv2 36/56] merge-recursive: Provide more info in conflict markers with file renames

From
Elijah Newren <newren@gmail.com>
Date
Aug 12, 2011, 05:20 UTC
Message-ID
<1313126429-17368-37-git-send-email-newren@gmail.com>
In-Reply-To
<1313126429-17368-1-git-send-email-newren@gmail.com>

Whenever there are merge conflicts in file contents, we would mark the different sides of the conflict with the two branches being merged. However, when there is a rename involved as well, the branchname is not sufficient to specify where the conflicting content came from. In such cases, mark the two sides of the conflict with branchname:filename rather than just branchname.

Signed-off-by: Elijah Newren <newren@gmail.com>
---
Changes since v1: Fix bug where I could get filenames from two
  branches reversed depending on the direction of the merge.
 merge-recursive.c                    |   28 +++++++++++-
 t/t6022-merge-rename.sh              |   75 ++++++++++++++++++++++++++++++++--
 t/t6042-merge-rename-corner-cases.sh |    2 +-
 3 files changed, 97 insertions(+), 8 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 0635e1b..bc99f1a 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1355,6 +1355,7 @@ static int merge_content(struct merge_options *o,
 			 struct rename_conflict_info *rename_conflict_info)
 {
 	const char *reason = "content";
+	char *side1 = NULL, *side2 = NULL;
 	struct merge_file_info mfi;
 	struct diff_filespec one, a, b;
 	unsigned df_conflict_remains = 0;
@@ -1371,10 +1372,31 @@ static int merge_content(struct merge_options *o,
 	hashcpy(b.sha1, b_sha);
 	b.mode = b_mode;
 
-	mfi = merge_file(o, &one, &a, &b, o->branch1, o->branch2);
-	if (rename_conflict_info && dir_in_way(path, !o->call_depth)) {
-		df_conflict_remains = 1;
+	if (rename_conflict_info) {
+		const char *path1, *path2;
+		struct diff_filepair *pair1 = rename_conflict_info->pair1;
+
+		path1 = (o->branch1 == rename_conflict_info->branch1) ?
+			pair1->two->path : pair1->one->path;
+		/* If rename_conflict_info->pair2 != NULL, we are in
+		 * RENAME_ONE_FILE_TO_ONE case.  Otherwise, we have a
+		 * normal rename.
+		 */
+		path2 = (rename_conflict_info->pair2 ||
+			 o->branch2 == rename_conflict_info->branch1) ?
+			pair1->two->path : pair1->one->path;
+		side1 = xmalloc(strlen(o->branch1) + strlen(path1) + 2);
+		side2 = xmalloc(strlen(o->branch2) + strlen(path2) + 2);
+		sprintf(side1, "%s:%s", o->branch1, path1);
+		sprintf(side2, "%s:%s", o->branch2, path2);
+
+		if (dir_in_way(path, !o->call_depth))
+			df_conflict_remains = 1;
 	}
+	mfi = merge_file(o, &one, &a, &b,
+			 side1 ? side1 : o->branch1, side2 ? side2 : o->branch2);
+	free(side1);
+	free(side2);
 
 	if (mfi.clean && !df_conflict_remains &&
 	    sha_eq(mfi.sha, a_sha) && mfi.mode == a.mode)
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index fcc1d4c..4695cbc 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -351,11 +351,11 @@ cat >expected <<\EOF &&
 8
 9
 10
-<<<<<<< HEAD
+<<<<<<< HEAD:dir
 12
 =======
 11
->>>>>>> dir-not-in-way
+>>>>>>> dir-not-in-way:sub/file
 EOF
 
 test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in way' '
@@ -405,11 +405,11 @@ cat >expected <<\EOF &&
 8
 9
 10
-<<<<<<< HEAD
+<<<<<<< HEAD:sub/file
 11
 =======
 12
->>>>>>> renamed-file-has-conflicts
+>>>>>>> renamed-file-has-conflicts:dir
 EOF
 
 test_expect_success 'Same as previous, but merged other way' '
@@ -700,4 +700,71 @@ test_expect_success 'merge rename + small change' '
 	test $(git rev-parse HEAD:renamed_file) = $(git rev-parse HEAD~1:file)
 '
 
+test_expect_success 'setup for use of extended merge markers' '
+	git rm -rf . &&
+	git clean -fdqx &&
+	rm -rf .git &&
+	git init &&
+
+	printf "1\n2\n3\n4\n5\n6\n7\n8\n" >original_file &&
+	git add original_file &&
+	git commit -mA &&
+
+	git checkout -b rename &&
+	echo 9 >>original_file &&
+	git add original_file &&
+	git mv original_file renamed_file &&
+	git commit -mB &&
+
+	git checkout master &&
+	echo 8.5 >>original_file &&
+	git add original_file &&
+	git commit -mC
+'
+
+cat >expected <<\EOF &&
+1
+2
+3
+4
+5
+6
+7
+8
+<<<<<<< HEAD:renamed_file
+9
+=======
+8.5
+>>>>>>> master^0:original_file
+EOF
+
+test_expect_success 'merge master into rename has correct extended markers' '
+	git checkout rename^0 &&
+	test_must_fail git merge -s recursive master^0 &&
+	test_cmp expected renamed_file
+'
+
+cat >expected <<\EOF &&
+1
+2
+3
+4
+5
+6
+7
+8
+<<<<<<< HEAD:original_file
+8.5
+=======
+9
+>>>>>>> rename^0:renamed_file
+EOF
+
+test_expect_success 'merge rename into master has correct extended markers' '
+	git reset --hard &&
+	git checkout master^0 &&
+	test_must_fail git merge -s recursive rename^0 &&
+	test_cmp expected renamed_file
+'
+
 test_done
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 968055d..bfc3179 100755
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -258,7 +258,7 @@ test_expect_success 'rename/directory conflict + clean content merge' '
 	test -f newfile~HEAD
 '
 
-test_expect_failure 'rename/directory conflict + content merge conflict' '
+test_expect_success 'rename/directory conflict + content merge conflict' '
 	git reset --hard &&
 	git reset --hard &&
 	git clean -fdqx &&

-- 
1.7.6.100.gac5c1
Previous: Elijah NewrenNext: Elijah Newren
Message 41 of 65 in “[PATCHv2 00/57] Re-roll of en/merge-recursive from pu”
  1. Elijah NewrenAug 12, 2011
  2. 01/56 t6042: Add a testcase where git deletes an untracked fileElijah Newren, Aug 12, 2011
  3. 02/56 t6042: Add failing testcase for rename/modify/add-source conflictElijah Newren, Aug 12, 2011
  4. 03/56 t6042: Add a pair of cases where undetected renames cause issuesElijah Newren, Aug 12, 2011
  5. 04/56 t6042: Add a testcase where undetected rename causes silent file deletionElijah Newren, Aug 12, 2011
  6. 05/56 t6042: Add tests for content issues with modify/rename/directory conflictsElijah Newren, Aug 12, 2011
  7. 06/56 t6042: Ensure rename/rename conflicts leave index and workdir in sane stateElijah Newren, Aug 12, 2011
  8. 07/56 t6042: Add failing testcases for rename/rename/add-{source,dest} conflictsElijah Newren, Aug 12, 2011
  9. 08/56 t6036: Add differently resolved modify/delete conflict in criss-cross testElijah Newren, Aug 12, 2011
  10. 09/56 t6036: criss-cross with weird content can fool git into clean mergeElijah Newren, Aug 12, 2011
  11. 10/56 t6036: tests for criss-cross merges with various directory/file conflictsElijah Newren, Aug 12, 2011
  12. 11/56 t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modifyElijah Newren, Aug 12, 2011
  13. 12/56 t6036: criss-cross + rename/rename(1to2)/add-source + modify/modifyElijah Newren, Aug 12, 2011
  14. 13/56 t6022: Remove unnecessary untracked files to make test cleanerElijah Newren, Aug 12, 2011
  15. 14/56 t6022: New tests checking for unnecessary updates of filesElijah Newren, Aug 12, 2011
  16. 15/56 t6022: Add testcase for merging a renamed file with a simple changeElijah Newren, Aug 12, 2011
  17. 16/56 merge-recursive: Make BUG message more legible by adding a newlineElijah Newren, Aug 12, 2011
  18. 17/56 merge-recursive: Correct a commentElijah Newren, Aug 12, 2011
  19. 18/56 merge-recursive: Mark some diff_filespec struct arguments constElijah Newren, Aug 12, 2011
  20. 19/56 merge-recursive: Consolidate different update_stages functionsElijah Newren, Aug 12, 2011
  21. 20/56 merge-recursive: Remember to free generated unique path namesElijah Newren, Aug 12, 2011
  22. 21/56 merge-recursive: Avoid working directory changes during recursive caseElijah Newren, Aug 12, 2011
  23. 22/56 merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren, Aug 12, 2011
  24. 23/56 merge-recursive: Fix sorting order and directory change assumptionsElijah Newren, Aug 12, 2011
  25. 24/56 merge-recursive: Fix code checking for D/F conflicts still being presentElijah Newren, Aug 12, 2011
  26. 25/56 merge-recursive: Save D/F conflict filenames instead of unlinking themElijah Newren, Aug 12, 2011
  27. 26/56 merge-recursive: Split was_tracked() out of would_lose_untracked()Elijah Newren, Aug 12, 2011
  28. 27/56 string-list: Add API to remove an item from an unsorted listElijah Newren, Aug 12, 2011
  29. Johannes SixtAug 12, 2011
  30. Alex RiesenAug 12, 2011
  31. Elijah NewrenAug 12, 2011
  32. Johannes SixtAug 13, 2011
  33. 28/56 merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren, Aug 12, 2011
  34. 29/56 merge-recursive: Split update_stages_and_entry; only update stages at endElijah Newren, Aug 12, 2011
  35. 30/56 merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren, Aug 12, 2011
  36. 31/56 merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren, Aug 12, 2011
  37. 32/56 merge-recursive: Add comments about handling rename/add-source casesElijah Newren, Aug 12, 2011
  38. 33/56 merge-recursive: Improve handling of rename target vs. directory additionElijah Newren, Aug 12, 2011
  39. 34/56 merge-recursive: Consolidate process_entry() and process_df_entry()Elijah Newren, Aug 12, 2011
  40. 35/56 merge-recursive: Cleanup and consolidation of rename_conflict_infoElijah Newren, Aug 12, 2011
  41. 36/56 merge-recursive: Provide more info in conflict markers with file renamesElijah Newren, Aug 12, 2011
  42. 37/56 merge-recursive: When we detect we can skip an update, actually skip itElijah Newren, Aug 12, 2011
  43. 38/56 merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren, Aug 12, 2011
  44. 39/56 merge-recursive: Introduce a merge_file convenience functionElijah Newren, Aug 12, 2011
  45. 40/56 merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren, Aug 12, 2011
  46. 41/56 merge-recursive: Small cleanups for conflict_rename_rename_1to2Elijah Newren, Aug 12, 2011
  47. 42/56 merge-recursive: Defer rename/rename(2to1) handling until process_entryElijah Newren, Aug 12, 2011
  48. 43/56 merge-recursive: Record more data needed for merging with dual renamesElijah Newren, Aug 12, 2011
  49. 44/56 merge-recursive: Create function for merging with branchname:file markersElijah Newren, Aug 12, 2011
  50. 45/56 merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren, Aug 12, 2011
  51. 46/56 merge-recursive: Make modify/delete handling code reusableElijah Newren, Aug 12, 2011
  52. 47/56 merge-recursive: Have conflict_rename_delete reuse modify/delete codeElijah Newren, Aug 12, 2011
  53. 48/56 merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren, Aug 12, 2011
  54. 49/56 merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren, Aug 12, 2011
  55. 50/56 t3030: fix accidental success in symlink renameElijah Newren, Aug 12, 2011
  56. 51/56 t6022: Add testcase for spurious "refusing to lose untracked" messagesElijah Newren, Aug 12, 2011
  57. 52/56 merge-recursive: Fix spurious 'refusing to lose untracked file...' messagesElijah Newren, Aug 12, 2011
  58. 53/56 t6022: Additional tests checking for unnecessary updates of filesElijah Newren, Aug 12, 2011
  59. 54/56 merge-recursive: Avoid unnecessary file rewritesElijah Newren, Aug 12, 2011
  60. 55/56 t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyElijah Newren, Aug 12, 2011
  61. 56/56 merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren, Aug 12, 2011
  62. Junio C HamanoAug 12, 2011
  63. Elijah NewrenAug 12, 2011
  64. Elijah NewrenAug 13, 2011
  65. 57/57 merge-recursive: Don't re-sort a list whose order we depend uponElijah Newren, Aug 13, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.