{"thread":{"id":"48327","subject":"squash! Merge branch 'ps/test-chmtime-get'","startedAt":"2018-04-19T17:50:31Z","lastAt":"2018-04-20T08:12:39Z","messageCount":2,"participants":["Johannes Sixt","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"345116","messageId":"cb9ae7a4-88eb-9f74-1596-d24ed2dd4371@kdbg.org","threadId":"48327","inReplyTo":null,"subject":"squash! Merge branch 'ps/test-chmtime-get'","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2018-04-19T17:50:24Z","receivedAt":"2018-04-19T17:50:31Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Junio,\n\nyou may want to squash this into your merge commit of branch\nps/test-chmtime-get (today it is fa57c0871fc9)\n\n-- Hannes\n\ndiff --git a/t/helper/test-chmtime.c b/t/helper/test-chmtime.c\nindex daeddc1cbc..aa22af48c2 100644\n--- a/t/helper/test-chmtime.c\n+++ b/t/helper/test-chmtime.c\n@@ -25,7 +25,7 @@\n  *\n  * To print only the mtime use --get:\n  *\n- *\ttest-chmtime --get file\n+ *\ttest-tool chmtime --get file\n  *\n  * To set the mtime to current time:\n  *\n@@ -33,7 +33,7 @@\n  *\n  * To set the file mtime offset to +1 and print the new value:\n  *\n- *\ttest-chmtime --get +1 file\n+ *\ttest-tool chmtime --get +1 file\n  *\n  */\n #include \"test-tool.h\"\n"},{"id":"345198","messageId":"xmqqtvs6b8k5.fsf@gitster-ct.c.googlers.com","threadId":"48327","inReplyTo":"cb9ae7a4-88eb-9f74-1596-d24ed2dd4371@kdbg.org","subject":"Re: squash! Merge branch 'ps/test-chmtime-get'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-04-20T08:12:26Z","receivedAt":"2018-04-20T08:12:39Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt <j6t@kdbg.org> writes:\n\n> Junio,\n>\n> you may want to squash this into your merge commit of branch\n> ps/test-chmtime-get (today it is fa57c0871fc9)\n>\n> -- Hannes\n>\n> diff --git a/t/helper/test-chmtime.c b/t/helper/test-chmtime.c\n> index daeddc1cbc..aa22af48c2 100644\n> --- a/t/helper/test-chmtime.c\n> +++ b/t/helper/test-chmtime.c\n> @@ -25,7 +25,7 @@\n>   *\n>   * To print only the mtime use --get:\n>   *\n> - *\ttest-chmtime --get file\n> + *\ttest-tool chmtime --get file\n>   *\n>   * To set the mtime to current time:\n>   *\n> @@ -33,7 +33,7 @@\n>   *\n>   * To set the file mtime offset to +1 and print the new value:\n>   *\n> - *\ttest-chmtime --get +1 file\n> + *\ttest-tool chmtime --get +1 file\n>   *\n>   */\n>  #include \"test-tool.h\"\n\nThanks.\n\nIt might be a good idea to make a merge where one branch renames and\nboth branches make changes to the contents to always signal a\nfailure in auto-merge and require manual inspection of the result\neven when the content level 3-way merge cleanly resolves to avoid a\ngotcha like this.  If the renaming side had to modify existing\ncontents (i.e. it had to update \"test-chmtime\" to \"test-tool\nchmtime\" for a feature that existed in the common ancestor), then it\nis plausible that the updating side that introduced changes to the\ncontents (i.e. a newly added \"test-chmtime --get\") needs a similar\nadjustment, which is what your patch shows.  On the other hand, if\nthe renaming side did a pure rename without content change, and the\nother side updated contents, it is much less likely that we need to\nadjust the new material added on the updating side for the rename.\n\nWe would be introducing a case where the entry for each of the three\nstages is still present in the index even though there is no\nconflict markers in the working tree files if we did so, so there\nmay be some stuff that needs adjusting to the fallout from such a\nchange (e.g.  \"rerere remaining\" might get confused).\n"}]}