[fossil-users] New fossil skin and configuration

2016-09-06 Thread Erik Lechak
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

Re: [fossil-users] Infinite loop on merge

2016-09-06 Thread Andy Goth
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

Re: [fossil-users] Infinite loop on merge

2016-09-06 Thread Richard Hipp
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 @@

Re: [fossil-users] Infinite loop on merge

2016-09-06 Thread Richard Hipp
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 ___

Re: [fossil-users] change sync URL

2016-09-06 Thread Andy Goth
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

Re: [fossil-users] Infinite loop on merge

2016-09-06 Thread Joel Bruick
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.