Re: [PATCH v3 8/8] merge-recursive: improve rename/rename(1to2)/add[/add] handling

2018-11-02 Thread Derrick Stolee
On 11/2/2018 1:27 PM, Elijah Newren wrote: On Thu, Nov 1, 2018 at 12:01 AM Elijah Newren wrote: On Wed, Oct 31, 2018 at 8:08 AM Derrick Stolee wrote: On 10/19/2018 3:31 PM, Elijah Newren wrote: [snip] + char *new_path = NULL; + if

Re: [PATCH v3 8/8] merge-recursive: improve rename/rename(1to2)/add[/add] handling

2018-11-02 Thread Elijah Newren
On Thu, Nov 1, 2018 at 12:01 AM Elijah Newren wrote: > > On Wed, Oct 31, 2018 at 8:08 AM Derrick Stolee wrote: > > > > On 10/19/2018 3:31 PM, Elijah Newren wrote: > > > [snip] > > > > > > + char *new_path = NULL; > > > + if (dir_in_way(b->path,

Re: [PATCH v3 8/8] merge-recursive: improve rename/rename(1to2)/add[/add] handling

2018-11-01 Thread Elijah Newren
On Wed, Oct 31, 2018 at 8:08 AM Derrick Stolee wrote: > > On 10/19/2018 3:31 PM, Elijah Newren wrote: > > [snip] > > > > + char *new_path = NULL; > > + if (dir_in_way(b->path, !o->call_depth, 0)) { > > + new_path = unique_path(o,

Re: [PATCH v3 8/8] merge-recursive: improve rename/rename(1to2)/add[/add] handling

2018-10-31 Thread Derrick Stolee
On 10/19/2018 3:31 PM, Elijah Newren wrote: [snip] + char *new_path = NULL; + if (dir_in_way(b->path, !o->call_depth, 0)) { + new_path = unique_path(o, b->path, ci->branch2); + output(o, 1,

[PATCH v3 8/8] merge-recursive: improve rename/rename(1to2)/add[/add] handling

2018-10-19 Thread Elijah Newren
When we have a rename/rename(1to2) conflict, each of the renames can collide with a file addition. Each of these rename/add conflicts suffered from the same kinds of problems that normal rename/add suffered from. Make the code use handle_file_conflicts() as well so that we get all the same fixes