Re: [PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory

Sorry for the long delay before getting back to this; the other stuff I was working on took longer than expected. On Mon, Oct 14, 2019 at 3:42 AM Johannes Schindelin wrote: > On Sat, 12 Oct 2019, Elijah Newren wrote: > > On Sat, Oct 12, 2019 at 1:37 PM Johannes Schindelin > > wrote: > > > > > >

Re: [PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory

Hi Elijah, On Sat, 12 Oct 2019, Elijah Newren wrote: > On Sat, Oct 12, 2019 at 1:37 PM Johannes Schindelin > wrote: > > > [...] > > For the record: I am still a huge anti-fan of splitting `setup` test > > cases from the test cases that do actual things, _unless_ it is > > _one_, and _only one_,

Re: [PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory

Hi Dscho, Thanks for the reviews! On Sat, Oct 12, 2019 at 1:37 PM Johannes Schindelin wrote: > On Fri, 11 Oct 2019, Elijah Newren via GitGitGadget wrote: > [...] > > @@ -1980,6 +1990,25 @@ static void get_renamed_dir_portion(const char > > *old_path, const char *new_path, > > *end_of_

Re: [PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory

Hi Elijah, On Fri, 11 Oct 2019, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren > > We allow renaming all entries in e.g. a directory named z/ into a > directory named y/ to be detected as a z/ -> y/ rename, so that if the > other side of history adds any files to the directory z/ in

[PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory

From: Elijah Newren We allow renaming all entries in e.g. a directory named z/ into a directory named y/ to be detected as a z/ -> y/ rename, so that if the other side of history adds any files to the directory z/ in the mean time, we can provide the hint that they should be moved to y/. There i