Hi Andy,
On 9/6/2016 3:26 PM, Andy Goth wrote:
That seems to fix it. Thank you very much for the astonishingly fast
turnaround. There may be unintended consequences since we haven't
done much analysis yet, so I checked your change in on the
merge-rename-lockup branch pending further testing.
Hi,
I've created a new skin/configuration that I thought some of you might be
interested in. It's not the prettiest, but I thought I would work on
functionality before I spent too much time on aesthetics.
I had to hijack some of the ticket pages in order to make use of TH1.
It has the following
Let me add that the -once option for sync is useful to inhibit
automatically changing the remote-url. I need this on occasion when I'm
manually sync'ing between several (more than two) systems in the temporary
absence of a central server.
On Wed, Aug 10, 2016 at 3:37 PM, Warren Young wrote:
> On
That seems to fix it. Thank you very much for the astonishingly fast
turnaround. There may be unintended consequences since we haven't done much
analysis yet, so I checked your change in on the merge-rename-lockup
branch pending further testing.
On Tue, Sep 6, 2016 at 2:20 PM, Richard Hipp wrote:
On 9/6/16, Andy Goth wrote:
>
> The repository is private, sorry, but I should be able to help with
> debugging.
>
Just a guess:
Index: src/merge.c
==
--- src/merge.c
+++ src/merge.c
@@ -395,11 +395,11 @@
}
if( zPivot ){
On 9/6/16, Andy Goth wrote:
> The latest trunk is broken (w.r.t. the merge in question), as is apparently
> everything starting with 41c2220934. Version 1.34 is good, as is the
> version immediately before 41c2220934. I see no reason to downgrade to
> anything before 1.34, since that's what I've b
The latest trunk is broken (w.r.t. the merge in question), as is apparently
everything starting with 41c2220934. Version 1.34 is good, as is the
version immediately before 41c2220934. I see no reason to downgrade to
anything before 1.34, since that's what I've been using successfully since
its rele
On 9/6/16, Andy Goth wrote:
>
> Today I upgraded from Fossil 1.34, and it
> looks like I'm going to have to switch back.
>
Try using trunk before you downgrade to 1.33 or 1.32.
--
D. Richard Hipp
d...@sqlite.org
___
fossil-users mailing list
fossil-use
"f merge branch-name -baseline root:branch-name" is an infinite loop for me
since Fossil change 41c2220934, as determined by bisection. Version
4d1f2d302b (latest trunk) is bad too. Execution hangs up inside SQLite.
The check-in comment for 41c2220934 is "Improve the merge command's ability
to han
9 matches
Mail list logo
