{"thread":{"id":"15167","subject":"[PATCH] Revert \"Convert output messages in merge-recursive to past tense.\"","startedAt":"2008-08-22T17:18:44Z","lastAt":"2008-08-23T12:14:57Z","messageCount":5,"participants":["Jonathan del Strother","Junio C Hamano","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"88162","messageId":"1219425524-77545-1-git-send-email-maillist@steelskies.com","threadId":"15167","inReplyTo":null,"subject":"[PATCH] Revert \"Convert output messages in merge-recursive to past tense.\"","fromName":"Jonathan del Strother","fromEmail":"maillist@steelskies.com","sentAt":"2008-08-22T17:18:44Z","receivedAt":"2008-08-22T17:18:44Z","isPatch":true,"sender":{"key":"jon.delstrother@bestbefore.tv","avatar":"https://gravatar.com/avatar/754e21ab701c00e2d21fc261187254c34b2a1c0b959d9ee5be1a295990be3081?d=mp&s=160"},"body":"Now that the progress meter is gone, merge messages make more sense when presented in present tense\n\nThis reverts commit 89f40be294363ce4d14ed6931a65561a4e8e9140.\n\nConflicts:\n\n\tbuiltin-merge-recursive.c\n---\n\nI was confused by the output of git-merge recently - you typically get something like this:\n\n  Auto-merged foo.txt\n  CONFLICT (content): Merge conflict in foo.txt\n  Recorded preimage for 'foo.txt'\n  Automatic merge failed; fix conflicts and then commit the result.\n\nThe first line of which makes it sounds like it's already managed to merge successfully.\nThere used to be a progress meter just above this, in the context of which the past tense might make sense.\nNow that that meter is gone (ad57cbca61), present tense seems more natural.\n\n\n builtin-merge-recursive.c |   36 ++++++++++++++++++------------------\n 1 files changed, 18 insertions(+), 18 deletions(-)\n\ndiff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c\nindex 43e55bf..dfb363e 100644\n--- a/builtin-merge-recursive.c\n+++ b/builtin-merge-recursive.c\n@@ -729,13 +729,13 @@ static void conflict_rename_rename(struct rename *ren1,\n \tconst char *dst_name2 = ren2_dst;\n \tif (string_list_has_string(&current_directory_set, ren1_dst)) {\n \t\tdst_name1 = del[delp++] = unique_path(ren1_dst, branch1);\n-\t\toutput(1, \"%s is a directory in %s added as %s instead\",\n+\t\toutput(1, \"%s is a directory in %s adding as %s instead\",\n \t\t       ren1_dst, branch2, dst_name1);\n \t\tremove_file(0, ren1_dst, 0);\n \t}\n \tif (string_list_has_string(&current_directory_set, ren2_dst)) {\n \t\tdst_name2 = del[delp++] = unique_path(ren2_dst, branch2);\n-\t\toutput(1, \"%s is a directory in %s added as %s instead\",\n+\t\toutput(1, \"%s is a directory in %s adding as %s instead\",\n \t\t       ren2_dst, branch1, dst_name2);\n \t\tremove_file(0, ren2_dst, 0);\n \t}\n@@ -760,7 +760,7 @@ static void conflict_rename_dir(struct rename *ren1,\n \t\t\t\tconst char *branch1)\n {\n \tchar *new_path = unique_path(ren1->pair->two->path, branch1);\n-\toutput(1, \"Renamed %s to %s instead\", ren1->pair->one->path, new_path);\n+\toutput(1, \"Renaming %s to %s instead\", ren1->pair->one->path, new_path);\n \tremove_file(0, ren1->pair->two->path, 0);\n \tupdate_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);\n \tfree(new_path);\n@@ -773,7 +773,7 @@ static void conflict_rename_rename_2(struct rename *ren1,\n {\n \tchar *new_path1 = unique_path(ren1->pair->two->path, branch1);\n \tchar *new_path2 = unique_path(ren2->pair->two->path, branch2);\n-\toutput(1, \"Renamed %s to %s and %s to %s instead\",\n+\toutput(1, \"Renaming %s to %s and %s to %s instead\",\n \t       ren1->pair->one->path, new_path1,\n \t       ren2->pair->one->path, new_path2);\n \tremove_file(0, ren1->pair->two->path, 0);\n@@ -887,10 +887,10 @@ static int process_renames(struct string_list *a_renames,\n \t\t\t\t\t\t branch1,\n \t\t\t\t\t\t branch2);\n \t\t\t\tif (mfi.merge || !mfi.clean)\n-\t\t\t\t\toutput(1, \"Renamed %s->%s\", src, ren1_dst);\n+\t\t\t\t\toutput(1, \"Renaming %s->%s\", src, ren1_dst);\n \n \t\t\t\tif (mfi.merge)\n-\t\t\t\t\toutput(2, \"Auto-merged %s\", ren1_dst);\n+\t\t\t\t\toutput(2, \"Auto-merging %s\", ren1_dst);\n \n \t\t\t\tif (!mfi.clean) {\n \t\t\t\t\toutput(1, \"CONFLICT (content): merge conflict in %s\",\n@@ -924,14 +924,14 @@ static int process_renames(struct string_list *a_renames,\n \n \t\t\tif (string_list_has_string(&current_directory_set, ren1_dst)) {\n \t\t\t\tclean_merge = 0;\n-\t\t\t\toutput(1, \"CONFLICT (rename/directory): Renamed %s->%s in %s \"\n+\t\t\t\toutput(1, \"CONFLICT (rename/directory): Rename %s->%s in %s \"\n \t\t\t\t       \" directory %s added in %s\",\n \t\t\t\t       ren1_src, ren1_dst, branch1,\n \t\t\t\t       ren1_dst, branch2);\n \t\t\t\tconflict_rename_dir(ren1, branch1);\n \t\t\t} else if (sha_eq(src_other.sha1, null_sha1)) {\n \t\t\t\tclean_merge = 0;\n-\t\t\t\toutput(1, \"CONFLICT (rename/delete): Renamed %s->%s in %s \"\n+\t\t\t\toutput(1, \"CONFLICT (rename/delete): Rename %s->%s in %s \"\n \t\t\t\t       \"and deleted in %s\",\n \t\t\t\t       ren1_src, ren1_dst, branch1,\n \t\t\t\t       branch2);\n@@ -940,19 +940,19 @@ static int process_renames(struct string_list *a_renames,\n \t\t\t\tconst char *new_path;\n \t\t\t\tclean_merge = 0;\n \t\t\t\ttry_merge = 1;\n-\t\t\t\toutput(1, \"CONFLICT (rename/add): Renamed %s->%s in %s. \"\n+\t\t\t\toutput(1, \"CONFLICT (rename/add): Rename %s->%s in %s. \"\n \t\t\t\t       \"%s added in %s\",\n \t\t\t\t       ren1_src, ren1_dst, branch1,\n \t\t\t\t       ren1_dst, branch2);\n \t\t\t\tnew_path = unique_path(ren1_dst, branch2);\n-\t\t\t\toutput(1, \"Added as %s instead\", new_path);\n+\t\t\t\toutput(1, \"Adding as %s instead\", new_path);\n \t\t\t\tupdate_file(0, dst_other.sha1, dst_other.mode, new_path);\n \t\t\t} else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {\n \t\t\t\tren2 = item->util;\n \t\t\t\tclean_merge = 0;\n \t\t\t\tren2->processed = 1;\n-\t\t\t\toutput(1, \"CONFLICT (rename/rename): Renamed %s->%s in %s. \"\n-\t\t\t\t       \"Renamed %s->%s in %s\",\n+\t\t\t\toutput(1, \"CONFLICT (rename/rename): Rename %s->%s in %s. \"\n+\t\t\t\t       \"Rename %s->%s in %s\",\n \t\t\t\t       ren1_src, ren1_dst, branch1,\n \t\t\t\t       ren2->pair->one->path, ren2->pair->two->path, branch2);\n \t\t\t\tconflict_rename_rename_2(ren1, branch1, ren2, branch2);\n@@ -986,9 +986,9 @@ static int process_renames(struct string_list *a_renames,\n \t\t\t\t\toutput(3, \"Skipped %s (merged same as existing)\", ren1_dst);\n \t\t\t\telse {\n \t\t\t\t\tif (mfi.merge || !mfi.clean)\n-\t\t\t\t\t\toutput(1, \"Renamed %s => %s\", ren1_src, ren1_dst);\n+\t\t\t\t\t\toutput(1, \"Renaming %s => %s\", ren1_src, ren1_dst);\n \t\t\t\t\tif (mfi.merge)\n-\t\t\t\t\t\toutput(2, \"Auto-merged %s\", ren1_dst);\n+\t\t\t\t\t\toutput(2, \"Auto-merging %s\", ren1_dst);\n \t\t\t\t\tif (!mfi.clean) {\n \t\t\t\t\t\toutput(1, \"CONFLICT (rename/modify): Merge conflict in %s\",\n \t\t\t\t\t\t       ren1_dst);\n@@ -1039,7 +1039,7 @@ static int process_entry(const char *path, struct stage_data *entry,\n \t\t\t/* Deleted in both or deleted in one and\n \t\t\t * unchanged in the other */\n \t\t\tif (a_sha)\n-\t\t\t\toutput(2, \"Removed %s\", path);\n+\t\t\t\toutput(2, \"Removing %s\", path);\n \t\t\t/* do not touch working file if it did not exist */\n \t\t\tremove_file(1, path, !a_sha);\n \t\t} else {\n@@ -1086,12 +1086,12 @@ static int process_entry(const char *path, struct stage_data *entry,\n \t\t\tconst char *new_path = unique_path(path, add_branch);\n \t\t\tclean_merge = 0;\n \t\t\toutput(1, \"CONFLICT (%s): There is a directory with name %s in %s. \"\n-\t\t\t       \"Added %s as %s\",\n+\t\t\t       \"Adding %s as %s\",\n \t\t\t       conf, path, other_branch, path, new_path);\n \t\t\tremove_file(0, path, 0);\n \t\t\tupdate_file(0, sha, mode, new_path);\n \t\t} else {\n-\t\t\toutput(2, \"Added %s\", path);\n+\t\t\toutput(2, \"Adding %s\", path);\n \t\t\tupdate_file(1, sha, mode, path);\n \t\t}\n \t} else if (a_sha && b_sha) {\n@@ -1105,7 +1105,7 @@ static int process_entry(const char *path, struct stage_data *entry,\n \t\t\treason = \"add/add\";\n \t\t\to_sha = (unsigned char *)null_sha1;\n \t\t}\n-\t\toutput(2, \"Auto-merged %s\", path);\n+\t\toutput(2, \"Auto-merging %s\", path);\n \t\to.path = a.path = b.path = (char *)path;\n \t\thashcpy(o.sha1, o_sha);\n \t\to.mode = o_mode;\n-- \n1.6.0.6.gc667.dirty\n"},{"id":"88216","messageId":"7v7ia87k2e.fsf@gitster.siamese.dyndns.org","threadId":"15167","inReplyTo":"1219425524-77545-1-git-send-email-maillist@steelskies.com","subject":"Re: [PATCH] Revert \"Convert output messages in merge-recursive to past tense.\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-08-22T22:37:29Z","receivedAt":"2008-08-22T22:37:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan del Strother <maillist@steelskies.com> writes:\n\n> Now that the progress meter is gone, merge messages make more sense when presented in present tense\n>\n> This reverts commit 89f40be294363ce4d14ed6931a65561a4e8e9140.\n>\n> Conflicts:\n>\n> \tbuiltin-merge-recursive.c\n> ---\n\n\"Conflicts:\"?  Please either remove it or describe how you resolved the\nconflicts.\n\nSign-off?\n\nThe patch looked Ok to me.  Shawn?\n"},{"id":"88224","messageId":"20080822230346.GN3483@spearce.org","threadId":"15167","inReplyTo":"7v7ia87k2e.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Revert \"Convert output messages in merge-recursive to past tense.\"","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-08-22T23:03:46Z","receivedAt":"2008-08-22T23:03:46Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Junio C Hamano <gitster@pobox.com> wrote:\n> Jonathan del Strother <maillist@steelskies.com> writes:\n> \n> > Now that the progress meter is gone, merge messages make more sense when presented in present tense\n> >\n> > This reverts commit 89f40be294363ce4d14ed6931a65561a4e8e9140.\n> >\n> > Conflicts:\n> >\n> > \tbuiltin-merge-recursive.c\n> > ---\n> \n> \"Conflicts:\"?  Please either remove it or describe how you resolved the\n> conflicts.\n\nThe conflicts are likely because this was run with git-revert and a\nfew hunks had to be manually merged.  The result of the patch looks\nfine to me.  But the \"Conflicts\" part of the message is likely not\ninteresting here.\n \n> Sign-off?\n> \n> The patch looked Ok to me.  Shawn?\n\nAcked-by: Shawn O. Pearce <spearce@spearce.org>\n\n-- \nShawn.\n"},{"id":"88292","messageId":"1219493636-85340-1-git-send-email-maillist@steelskies.com","threadId":"15167","inReplyTo":"1219425524-77545-1-git-send-email-maillist@steelskies.com","subject":"[PATCH] Revert \"Convert output messages in merge-recursive to past tense.\"","fromName":"Jonathan del Strother","fromEmail":"maillist@steelskies.com","sentAt":"2008-08-23T12:13:56Z","receivedAt":"2008-08-23T12:13:56Z","isPatch":true,"sender":{"key":"jon.delstrother@bestbefore.tv","avatar":"https://gravatar.com/avatar/754e21ab701c00e2d21fc261187254c34b2a1c0b959d9ee5be1a295990be3081?d=mp&s=160"},"body":"From: Jonathan del Strother <jon.delStrother@bestbefore.tv>\n\nNow that the progress meter is gone, merge messages make more sense when presented in present tense\n\nThis reverts commit 89f40be294363ce4d14ed6931a65561a4e8e9140.\n\nSigned-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv>\n---\nSorry about that - that's what I get for trying to do things last thing on a friday.\nAdding signed-off, removing the conflict report.\n\n builtin-merge-recursive.c |   36 ++++++++++++++++++------------------\n 1 files changed, 18 insertions(+), 18 deletions(-)\n\ndiff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c\nindex 43e55bf..dfb363e 100644\n--- a/builtin-merge-recursive.c\n+++ b/builtin-merge-recursive.c\n@@ -729,13 +729,13 @@ static void conflict_rename_rename(struct rename *ren1,\n \tconst char *dst_name2 = ren2_dst;\n \tif (string_list_has_string(&current_directory_set, ren1_dst)) {\n \t\tdst_name1 = del[delp++] = unique_path(ren1_dst, branch1);\n-\t\toutput(1, \"%s is a directory in %s added as %s instead\",\n+\t\toutput(1, \"%s is a directory in %s adding as %s instead\",\n \t\t       ren1_dst, branch2, dst_name1);\n \t\tremove_file(0, ren1_dst, 0);\n \t}\n \tif (string_list_has_string(&current_directory_set, ren2_dst)) {\n \t\tdst_name2 = del[delp++] = unique_path(ren2_dst, branch2);\n-\t\toutput(1, \"%s is a directory in %s added as %s instead\",\n+\t\toutput(1, \"%s is a directory in %s adding as %s instead\",\n \t\t       ren2_dst, branch1, dst_name2);\n \t\tremove_file(0, ren2_dst, 0);\n \t}\n@@ -760,7 +760,7 @@ static void conflict_rename_dir(struct rename *ren1,\n \t\t\t\tconst char *branch1)\n {\n \tchar *new_path = unique_path(ren1->pair->two->path, branch1);\n-\toutput(1, \"Renamed %s to %s instead\", ren1->pair->one->path, new_path);\n+\toutput(1, \"Renaming %s to %s instead\", ren1->pair->one->path, new_path);\n \tremove_file(0, ren1->pair->two->path, 0);\n \tupdate_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);\n \tfree(new_path);\n@@ -773,7 +773,7 @@ static void conflict_rename_rename_2(struct rename *ren1,\n {\n \tchar *new_path1 = unique_path(ren1->pair->two->path, branch1);\n \tchar *new_path2 = unique_path(ren2->pair->two->path, branch2);\n-\toutput(1, \"Renamed %s to %s and %s to %s instead\",\n+\toutput(1, \"Renaming %s to %s and %s to %s instead\",\n \t       ren1->pair->one->path, new_path1,\n \t       ren2->pair->one->path, new_path2);\n \tremove_file(0, ren1->pair->two->path, 0);\n@@ -887,10 +887,10 @@ static int process_renames(struct string_list *a_renames,\n \t\t\t\t\t\t branch1,\n \t\t\t\t\t\t branch2);\n \t\t\t\tif (mfi.merge || !mfi.clean)\n-\t\t\t\t\toutput(1, \"Renamed %s->%s\", src, ren1_dst);\n+\t\t\t\t\toutput(1, \"Renaming %s->%s\", src, ren1_dst);\n \n \t\t\t\tif (mfi.merge)\n-\t\t\t\t\toutput(2, \"Auto-merged %s\", ren1_dst);\n+\t\t\t\t\toutput(2, \"Auto-merging %s\", ren1_dst);\n \n \t\t\t\tif (!mfi.clean) {\n \t\t\t\t\toutput(1, \"CONFLICT (content): merge conflict in %s\",\n@@ -924,14 +924,14 @@ static int process_renames(struct string_list *a_renames,\n \n \t\t\tif (string_list_has_string(&current_directory_set, ren1_dst)) {\n \t\t\t\tclean_merge = 0;\n-\t\t\t\toutput(1, \"CONFLICT (rename/directory): Renamed %s->%s in %s \"\n+\t\t\t\toutput(1, \"CONFLICT (rename/directory): Rename %s->%s in %s \"\n \t\t\t\t       \" directory %s added in %s\",\n \t\t\t\t       ren1_src, ren1_dst, branch1,\n \t\t\t\t       ren1_dst, branch2);\n \t\t\t\tconflict_rename_dir(ren1, branch1);\n \t\t\t} else if (sha_eq(src_other.sha1, null_sha1)) {\n \t\t\t\tclean_merge = 0;\n-\t\t\t\toutput(1, \"CONFLICT (rename/delete): Renamed %s->%s in %s \"\n+\t\t\t\toutput(1, \"CONFLICT (rename/delete): Rename %s->%s in %s \"\n \t\t\t\t       \"and deleted in %s\",\n \t\t\t\t       ren1_src, ren1_dst, branch1,\n \t\t\t\t       branch2);\n@@ -940,19 +940,19 @@ static int process_renames(struct string_list *a_renames,\n \t\t\t\tconst char *new_path;\n \t\t\t\tclean_merge = 0;\n \t\t\t\ttry_merge = 1;\n-\t\t\t\toutput(1, \"CONFLICT (rename/add): Renamed %s->%s in %s. \"\n+\t\t\t\toutput(1, \"CONFLICT (rename/add): Rename %s->%s in %s. \"\n \t\t\t\t       \"%s added in %s\",\n \t\t\t\t       ren1_src, ren1_dst, branch1,\n \t\t\t\t       ren1_dst, branch2);\n \t\t\t\tnew_path = unique_path(ren1_dst, branch2);\n-\t\t\t\toutput(1, \"Added as %s instead\", new_path);\n+\t\t\t\toutput(1, \"Adding as %s instead\", new_path);\n \t\t\t\tupdate_file(0, dst_other.sha1, dst_other.mode, new_path);\n \t\t\t} else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {\n \t\t\t\tren2 = item->util;\n \t\t\t\tclean_merge = 0;\n \t\t\t\tren2->processed = 1;\n-\t\t\t\toutput(1, \"CONFLICT (rename/rename): Renamed %s->%s in %s. \"\n-\t\t\t\t       \"Renamed %s->%s in %s\",\n+\t\t\t\toutput(1, \"CONFLICT (rename/rename): Rename %s->%s in %s. \"\n+\t\t\t\t       \"Rename %s->%s in %s\",\n \t\t\t\t       ren1_src, ren1_dst, branch1,\n \t\t\t\t       ren2->pair->one->path, ren2->pair->two->path, branch2);\n \t\t\t\tconflict_rename_rename_2(ren1, branch1, ren2, branch2);\n@@ -986,9 +986,9 @@ static int process_renames(struct string_list *a_renames,\n \t\t\t\t\toutput(3, \"Skipped %s (merged same as existing)\", ren1_dst);\n \t\t\t\telse {\n \t\t\t\t\tif (mfi.merge || !mfi.clean)\n-\t\t\t\t\t\toutput(1, \"Renamed %s => %s\", ren1_src, ren1_dst);\n+\t\t\t\t\t\toutput(1, \"Renaming %s => %s\", ren1_src, ren1_dst);\n \t\t\t\t\tif (mfi.merge)\n-\t\t\t\t\t\toutput(2, \"Auto-merged %s\", ren1_dst);\n+\t\t\t\t\t\toutput(2, \"Auto-merging %s\", ren1_dst);\n \t\t\t\t\tif (!mfi.clean) {\n \t\t\t\t\t\toutput(1, \"CONFLICT (rename/modify): Merge conflict in %s\",\n \t\t\t\t\t\t       ren1_dst);\n@@ -1039,7 +1039,7 @@ static int process_entry(const char *path, struct stage_data *entry,\n \t\t\t/* Deleted in both or deleted in one and\n \t\t\t * unchanged in the other */\n \t\t\tif (a_sha)\n-\t\t\t\toutput(2, \"Removed %s\", path);\n+\t\t\t\toutput(2, \"Removing %s\", path);\n \t\t\t/* do not touch working file if it did not exist */\n \t\t\tremove_file(1, path, !a_sha);\n \t\t} else {\n@@ -1086,12 +1086,12 @@ static int process_entry(const char *path, struct stage_data *entry,\n \t\t\tconst char *new_path = unique_path(path, add_branch);\n \t\t\tclean_merge = 0;\n \t\t\toutput(1, \"CONFLICT (%s): There is a directory with name %s in %s. \"\n-\t\t\t       \"Added %s as %s\",\n+\t\t\t       \"Adding %s as %s\",\n \t\t\t       conf, path, other_branch, path, new_path);\n \t\t\tremove_file(0, path, 0);\n \t\t\tupdate_file(0, sha, mode, new_path);\n \t\t} else {\n-\t\t\toutput(2, \"Added %s\", path);\n+\t\t\toutput(2, \"Adding %s\", path);\n \t\t\tupdate_file(1, sha, mode, path);\n \t\t}\n \t} else if (a_sha && b_sha) {\n@@ -1105,7 +1105,7 @@ static int process_entry(const char *path, struct stage_data *entry,\n \t\t\treason = \"add/add\";\n \t\t\to_sha = (unsigned char *)null_sha1;\n \t\t}\n-\t\toutput(2, \"Auto-merged %s\", path);\n+\t\toutput(2, \"Auto-merging %s\", path);\n \t\to.path = a.path = b.path = (char *)path;\n \t\thashcpy(o.sha1, o_sha);\n \t\to.mode = o_mode;\n-- \n1.6.0.6.gc667.dirty\n"},{"id":"88293","messageId":"1219493697-85555-1-git-send-email-maillist@steelskies.com","threadId":"15167","inReplyTo":"1219425524-77545-1-git-send-email-maillist@steelskies.com","subject":"[PATCH] Revert \"Convert output messages in merge-recursive to past tense.\"","fromName":"Jonathan del Strother","fromEmail":"maillist@steelskies.com","sentAt":"2008-08-23T12:14:57Z","receivedAt":"2008-08-23T12:14:57Z","isPatch":true,"sender":{"key":"jon.delstrother@bestbefore.tv","avatar":"https://gravatar.com/avatar/754e21ab701c00e2d21fc261187254c34b2a1c0b959d9ee5be1a295990be3081?d=mp&s=160"},"body":"Now that the progress meter is gone, merge messages make more sense when presented in present tense\n\nThis reverts commit 89f40be294363ce4d14ed6931a65561a4e8e9140.\n\nSigned-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv>\n---\nSorry about that - that's what I get for trying to do things last thing on a friday.\nAdding signed-off, removing the conflict report.\n\n...and trying once more with a non-broken header\n\n builtin-merge-recursive.c |   36 ++++++++++++++++++------------------\n 1 files changed, 18 insertions(+), 18 deletions(-)\n\ndiff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c\nindex 43e55bf..dfb363e 100644\n--- a/builtin-merge-recursive.c\n+++ b/builtin-merge-recursive.c\n@@ -729,13 +729,13 @@ static void conflict_rename_rename(struct rename *ren1,\n \tconst char *dst_name2 = ren2_dst;\n \tif (string_list_has_string(&current_directory_set, ren1_dst)) {\n \t\tdst_name1 = del[delp++] = unique_path(ren1_dst, branch1);\n-\t\toutput(1, \"%s is a directory in %s added as %s instead\",\n+\t\toutput(1, \"%s is a directory in %s adding as %s instead\",\n \t\t       ren1_dst, branch2, dst_name1);\n \t\tremove_file(0, ren1_dst, 0);\n \t}\n \tif (string_list_has_string(&current_directory_set, ren2_dst)) {\n \t\tdst_name2 = del[delp++] = unique_path(ren2_dst, branch2);\n-\t\toutput(1, \"%s is a directory in %s added as %s instead\",\n+\t\toutput(1, \"%s is a directory in %s adding as %s instead\",\n \t\t       ren2_dst, branch1, dst_name2);\n \t\tremove_file(0, ren2_dst, 0);\n \t}\n@@ -760,7 +760,7 @@ static void conflict_rename_dir(struct rename *ren1,\n \t\t\t\tconst char *branch1)\n {\n \tchar *new_path = unique_path(ren1->pair->two->path, branch1);\n-\toutput(1, \"Renamed %s to %s instead\", ren1->pair->one->path, new_path);\n+\toutput(1, \"Renaming %s to %s instead\", ren1->pair->one->path, new_path);\n \tremove_file(0, ren1->pair->two->path, 0);\n \tupdate_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);\n \tfree(new_path);\n@@ -773,7 +773,7 @@ static void conflict_rename_rename_2(struct rename *ren1,\n {\n \tchar *new_path1 = unique_path(ren1->pair->two->path, branch1);\n \tchar *new_path2 = unique_path(ren2->pair->two->path, branch2);\n-\toutput(1, \"Renamed %s to %s and %s to %s instead\",\n+\toutput(1, \"Renaming %s to %s and %s to %s instead\",\n \t       ren1->pair->one->path, new_path1,\n \t       ren2->pair->one->path, new_path2);\n \tremove_file(0, ren1->pair->two->path, 0);\n@@ -887,10 +887,10 @@ static int process_renames(struct string_list *a_renames,\n \t\t\t\t\t\t branch1,\n \t\t\t\t\t\t branch2);\n \t\t\t\tif (mfi.merge || !mfi.clean)\n-\t\t\t\t\toutput(1, \"Renamed %s->%s\", src, ren1_dst);\n+\t\t\t\t\toutput(1, \"Renaming %s->%s\", src, ren1_dst);\n \n \t\t\t\tif (mfi.merge)\n-\t\t\t\t\toutput(2, \"Auto-merged %s\", ren1_dst);\n+\t\t\t\t\toutput(2, \"Auto-merging %s\", ren1_dst);\n \n \t\t\t\tif (!mfi.clean) {\n \t\t\t\t\toutput(1, \"CONFLICT (content): merge conflict in %s\",\n@@ -924,14 +924,14 @@ static int process_renames(struct string_list *a_renames,\n \n \t\t\tif (string_list_has_string(&current_directory_set, ren1_dst)) {\n \t\t\t\tclean_merge = 0;\n-\t\t\t\toutput(1, \"CONFLICT (rename/directory): Renamed %s->%s in %s \"\n+\t\t\t\toutput(1, \"CONFLICT (rename/directory): Rename %s->%s in %s \"\n \t\t\t\t       \" directory %s added in %s\",\n \t\t\t\t       ren1_src, ren1_dst, branch1,\n \t\t\t\t       ren1_dst, branch2);\n \t\t\t\tconflict_rename_dir(ren1, branch1);\n \t\t\t} else if (sha_eq(src_other.sha1, null_sha1)) {\n \t\t\t\tclean_merge = 0;\n-\t\t\t\toutput(1, \"CONFLICT (rename/delete): Renamed %s->%s in %s \"\n+\t\t\t\toutput(1, \"CONFLICT (rename/delete): Rename %s->%s in %s \"\n \t\t\t\t       \"and deleted in %s\",\n \t\t\t\t       ren1_src, ren1_dst, branch1,\n \t\t\t\t       branch2);\n@@ -940,19 +940,19 @@ static int process_renames(struct string_list *a_renames,\n \t\t\t\tconst char *new_path;\n \t\t\t\tclean_merge = 0;\n \t\t\t\ttry_merge = 1;\n-\t\t\t\toutput(1, \"CONFLICT (rename/add): Renamed %s->%s in %s. \"\n+\t\t\t\toutput(1, \"CONFLICT (rename/add): Rename %s->%s in %s. \"\n \t\t\t\t       \"%s added in %s\",\n \t\t\t\t       ren1_src, ren1_dst, branch1,\n \t\t\t\t       ren1_dst, branch2);\n \t\t\t\tnew_path = unique_path(ren1_dst, branch2);\n-\t\t\t\toutput(1, \"Added as %s instead\", new_path);\n+\t\t\t\toutput(1, \"Adding as %s instead\", new_path);\n \t\t\t\tupdate_file(0, dst_other.sha1, dst_other.mode, new_path);\n \t\t\t} else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {\n \t\t\t\tren2 = item->util;\n \t\t\t\tclean_merge = 0;\n \t\t\t\tren2->processed = 1;\n-\t\t\t\toutput(1, \"CONFLICT (rename/rename): Renamed %s->%s in %s. \"\n-\t\t\t\t       \"Renamed %s->%s in %s\",\n+\t\t\t\toutput(1, \"CONFLICT (rename/rename): Rename %s->%s in %s. \"\n+\t\t\t\t       \"Rename %s->%s in %s\",\n \t\t\t\t       ren1_src, ren1_dst, branch1,\n \t\t\t\t       ren2->pair->one->path, ren2->pair->two->path, branch2);\n \t\t\t\tconflict_rename_rename_2(ren1, branch1, ren2, branch2);\n@@ -986,9 +986,9 @@ static int process_renames(struct string_list *a_renames,\n \t\t\t\t\toutput(3, \"Skipped %s (merged same as existing)\", ren1_dst);\n \t\t\t\telse {\n \t\t\t\t\tif (mfi.merge || !mfi.clean)\n-\t\t\t\t\t\toutput(1, \"Renamed %s => %s\", ren1_src, ren1_dst);\n+\t\t\t\t\t\toutput(1, \"Renaming %s => %s\", ren1_src, ren1_dst);\n \t\t\t\t\tif (mfi.merge)\n-\t\t\t\t\t\toutput(2, \"Auto-merged %s\", ren1_dst);\n+\t\t\t\t\t\toutput(2, \"Auto-merging %s\", ren1_dst);\n \t\t\t\t\tif (!mfi.clean) {\n \t\t\t\t\t\toutput(1, \"CONFLICT (rename/modify): Merge conflict in %s\",\n \t\t\t\t\t\t       ren1_dst);\n@@ -1039,7 +1039,7 @@ static int process_entry(const char *path, struct stage_data *entry,\n \t\t\t/* Deleted in both or deleted in one and\n \t\t\t * unchanged in the other */\n \t\t\tif (a_sha)\n-\t\t\t\toutput(2, \"Removed %s\", path);\n+\t\t\t\toutput(2, \"Removing %s\", path);\n \t\t\t/* do not touch working file if it did not exist */\n \t\t\tremove_file(1, path, !a_sha);\n \t\t} else {\n@@ -1086,12 +1086,12 @@ static int process_entry(const char *path, struct stage_data *entry,\n \t\t\tconst char *new_path = unique_path(path, add_branch);\n \t\t\tclean_merge = 0;\n \t\t\toutput(1, \"CONFLICT (%s): There is a directory with name %s in %s. \"\n-\t\t\t       \"Added %s as %s\",\n+\t\t\t       \"Adding %s as %s\",\n \t\t\t       conf, path, other_branch, path, new_path);\n \t\t\tremove_file(0, path, 0);\n \t\t\tupdate_file(0, sha, mode, new_path);\n \t\t} else {\n-\t\t\toutput(2, \"Added %s\", path);\n+\t\t\toutput(2, \"Adding %s\", path);\n \t\t\tupdate_file(1, sha, mode, path);\n \t\t}\n \t} else if (a_sha && b_sha) {\n@@ -1105,7 +1105,7 @@ static int process_entry(const char *path, struct stage_data *entry,\n \t\t\treason = \"add/add\";\n \t\t\to_sha = (unsigned char *)null_sha1;\n \t\t}\n-\t\toutput(2, \"Auto-merged %s\", path);\n+\t\toutput(2, \"Auto-merging %s\", path);\n \t\to.path = a.path = b.path = (char *)path;\n \t\thashcpy(o.sha1, o_sha);\n \t\to.mode = o_mode;\n-- \n1.6.0.6.gc667.dirty\n"}]}