On Thu, Mar 19, 2015 at 9:32 AM, bch wrote:
> > The reality is that nothing can be perfect for 100% of all possible use
> cases, and in this particular case, I just got unlucky. The merge conflict
> information as given couldn't support a mechanical "pick one or the other"
> resolution (which was
On Mar 19, 2015 12:40 AM, "Scott Robison" wrote:
>
> On Wed, Mar 18, 2015 at 5:41 PM, bch wrote:
>>
>> I tried this, and I see what you're talking about -- It's not clear to
>> me it's an error (I'm not apologizing for anything that happened here,
>> but I'd have to better understand the merge al
On Wed, Mar 18, 2015 at 5:41 PM, bch wrote:
> I tried this, and I see what you're talking about -- It's not clear to
> me it's an error (I'm not apologizing for anything that happened here,
> but I'd have to better understand the merge algorithm to know if this
> is logically sane). Its easy to s
On Wed, Mar 18, 2015 at 5:41 PM, bch wrote:
> I tried this, and I see what you're talking about -- It's not clear to
> me it's an error (I'm not apologizing for anything that happened here,
> but I'd have to better understand the merge algorithm to know if this
> is logically sane). Its easy to s
I tried this, and I see what you're talking about -- It's not clear to
me it's an error (I'm not apologizing for anything that happened here,
but I'd have to better understand the merge algorithm to know if this
is logically sane). Its easy to see how this could be confusing
though. I'll have to fi
On Wed, Mar 18, 2015 at 12:19 PM, bch wrote:
> Scott -- if there's a case you concoct (and post) that demonstrates
> the issue, more eyeballs and brains can review.
>
I posted a Reader's Digest condensed one earlier, but here it is in more
detail:
1. From an opened working directory of fossil,
Scott -- if there's a case you concoct (and post) that demonstrates
the issue, more eyeballs and brains can review.
-bch
On 3/18/15, Scott Robison wrote:
> On Wed, Mar 18, 2015 at 11:42 AM, Richard Hipp wrote:
>
>> On 3/18/15, Scott Robison wrote:
>> >
>> > Just FYI. I can try to take a look
On Wed, Mar 18, 2015 at 11:42 AM, Richard Hipp wrote:
> On 3/18/15, Scott Robison wrote:
> >
> > Just FYI. I can try to take a look at it later, but given the speed that
> > these things are often fixed, I figured I'd report it now.
> >
>
> Too many balls in flight right now. Please have a look
On 3/18/15, Scott Robison wrote:
>
> Just FYI. I can try to take a look at it later, but given the speed that
> these things are often fixed, I figured I'd report it now.
>
Too many balls in flight right now. Please have a look and send patches. Tnx.
--
D. Richard Hipp
d...@sqlite.org
I was going to get my old winsymlink branch caught up with trunk, so, using
a build from the tip of trunk (This is fossil version 1.32 [a7e1101d71]
2015-03-17 21:10:44 UTC) I:
1. fossil update winsymlink
2. fossil merge trunk
3. merge conflict reported for src\file.c, src\update.c, & src\vfile.c.
10 matches
Mail list logo
