Re: [PATCH v4 00/10] Improve path collision conflict resolutions

2018-11-02 Thread Elijah Newren
On Fri, Nov 2, 2018 at 12:09 PM Derrick Stolee wrote: > > On 11/2/2018 2:53 PM, Elijah Newren wrote: > > Major question: > >* You'll note that I edited the last two patches to mark them as RFC. > > To be honest, I'm not sure what to do with these. They improve code > > coverage of

Re: [PATCH v4 00/10] Improve path collision conflict resolutions

2018-11-02 Thread Derrick Stolee
On 11/2/2018 2:53 PM, Elijah Newren wrote: Major question: * You'll note that I edited the last two patches to mark them as RFC. To be honest, I'm not sure what to do with these. They improve code coverage of new code, but the same gaps existed in the old code; they only show

[PATCH v4 00/10] Improve path collision conflict resolutions

2018-11-02 Thread Elijah Newren
This series depends on en/merge-cleanup-more and is built on that series. (It merges cleanly to master, next, and pu -- well, as long as v3 of this series is excluded from pu, that is). This series makes all the "file collision" conflict types be handled consistently; making them all behave like