On Mon, Dec 4, 2017 at 11:33 AM, Stefan Beller wrote:
> On Sat, Nov 25, 2017 at 9:59 PM, Jacob Keller wrote:
>> On Sat, Nov 25, 2017 at 2:37 PM, Elijah Newren wrote:
>>> On Wed, Nov 15, 2017 at 9:13 AM, Jacob Keller
>>> wrote:
On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller wrote:
>>>
>>
On Sat, Nov 25, 2017 at 9:59 PM, Jacob Keller wrote:
> On Sat, Nov 25, 2017 at 2:37 PM, Elijah Newren wrote:
>> On Wed, Nov 15, 2017 at 9:13 AM, Jacob Keller wrote:
>>> On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller wrote:
>>
But this line of though might be distracting from your original
On Sat, Nov 25, 2017 at 2:37 PM, Elijah Newren wrote:
> On Wed, Nov 15, 2017 at 9:13 AM, Jacob Keller wrote:
>> On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller wrote:
>
>>> But this line of though might be distracting from your original point,
>>> which was that we have so much to keep in mind w
On Wed, Nov 15, 2017 at 9:13 AM, Jacob Keller wrote:
> On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller wrote:
>> But this line of though might be distracting from your original point,
>> which was that we have so much to keep in mind when doing tree
>> operations (flags, D/F conflicts, now submo
On Tue, Nov 14, 2017 at 10:13 AM, Stefan Beller wrote:
> Thanks for your reply!
>
> On Tue, Nov 14, 2017 at 9:17 AM, Elijah Newren wrote:
>> On Mon, Nov 13, 2017 at 3:46 PM, Stefan Beller wrote:
>>> On Mon, Nov 13, 2017 at 3:39 PM, Elijah Newren wrote:
On Mon, Nov 13, 2017 at 2:12 PM, Stef
Thanks for your reply!
On Tue, Nov 14, 2017 at 9:17 AM, Elijah Newren wrote:
> On Mon, Nov 13, 2017 at 3:46 PM, Stefan Beller wrote:
>> On Mon, Nov 13, 2017 at 3:39 PM, Elijah Newren wrote:
>>> On Mon, Nov 13, 2017 at 2:12 PM, Stefan Beller wrote:
I wanted to debug a very similar issue to
On Mon, Nov 13, 2017 at 3:46 PM, Stefan Beller wrote:
> On Mon, Nov 13, 2017 at 3:39 PM, Elijah Newren wrote:
>> On Mon, Nov 13, 2017 at 2:12 PM, Stefan Beller wrote:
>>> I wanted to debug a very similar issue today just after reviewing this
>>> series, see
>>> https://public-inbox.org/git/743ac
On Mon, Nov 13, 2017 at 3:39 PM, Elijah Newren wrote:
> On Mon, Nov 13, 2017 at 2:12 PM, Stefan Beller wrote:
>> I wanted to debug a very similar issue today just after reviewing this
>> series, see
>> https://public-inbox.org/git/743acc29-85bb-3773-b6a0-68d4a0b8f...@ispras.ru/
>
> Oh, bleh. Tha
On Mon, Nov 13, 2017 at 2:12 PM, Stefan Beller wrote:
> I wanted to debug a very similar issue today just after reviewing this
> series, see
> https://public-inbox.org/git/743acc29-85bb-3773-b6a0-68d4a0b8f...@ispras.ru/
Oh, bleh. That's not a D/F conflict at all, it's the code assuming
there's a
On Mon, Nov 13, 2017 at 2:04 PM, Elijah Newren wrote:
> Do you feel it's important that I come up with a demonstration case
> here? If so, I'll see if I can generate one.
I was mostly "just curious" on how you'd construct it theoretically.
> it's actually something newly possible only due to d
Thanks for the reviews!
On Mon, Nov 13, 2017 at 11:48 AM, Stefan Beller wrote:
> On Fri, Nov 10, 2017 at 11:05 AM, Elijah Newren wrote:
>> merge_trees() did a variety of work, including:
>> * Calling get_unmerged() to get unmerged entries
>> * Calling record_df_conflict_files() with all unme
On Fri, Nov 10, 2017 at 11:05 AM, Elijah Newren wrote:
> merge_trees() did a variety of work, including:
> * Calling get_unmerged() to get unmerged entries
> * Calling record_df_conflict_files() with all unmerged entries to
> do some work to ensure we could handle D/F conflicts correctly
>
merge_trees() did a variety of work, including:
* Calling get_unmerged() to get unmerged entries
* Calling record_df_conflict_files() with all unmerged entries to
do some work to ensure we could handle D/F conflicts correctly
* Calling get_renames() to check for renames.
An easily overlo
13 matches
Mail list logo