Re: [fossil-users] Infinite loop on merge

[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.


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 ){
 vAncestor = db_exists(
   "WITH RECURSIVE ancestor(id) AS ("
   "  VALUES(%d)"
-  "  UNION ALL"
+  "  UNION"
   "  SELECT pid FROM plink, ancestor"
   "   WHERE cid=ancestor.id  AND pid!=%d
AND cid!=%d)"
   "SELECT 1 FROM ancestor WHERE id=%d LIMIT 1",
   vid, nid, pid, pid
 ) ? 'p' : 'n';



This is the right fix. It ensures that each commit is only added to the 
queue by the recursive SELECT once instead of an exponential number of 
times based on how many merge commits it finds along the way, which is 
what caused your problem. I don't know why I used UNION ALL there, but 
it's definitely wrong.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] New fossil skin and configuration

[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 features:

Milestones
Streamlined ticket entry
Project summary in header
Message like ticket comments
Graphical milestone and ticket summary charts
Search box in header

You need fossil 1.35 to run it.

I've also created a python3 script that makes tinkering with the fossil
configuration a little bit easier.

You can find these things here:

http://www.eriklechak.com/content/fossil/index.html

To take a quick look just download test.fossil and run "fossil ui
test.fossil".  Add some tickets, milestones, users, and I think you'll get
the idea.

--Erik
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] change sync URL

[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  wrote:

> On Aug 10, 2016, at 12:55 PM, Ross Berteig  wrote:
> >
> > On 8/10/2016 11:43 AM, jungle Boogie wrote:
> >> If I have a repo syncing to example.com and I want to change it to
> >> sync locally on my network, what's the best method to update the sync
> >> url?
> >
> > Set the url:fossil remote-url http://new-url-here.local/
>
> You can also say “fossil sync http://new-url-here.local/“  The command is
> shorter and you get a free sync that way. :)
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>



-- 
Andy Goth | 
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Infinite loop on merge

[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 @@
   }
   if( zPivot ){
 vAncestor = db_exists(
   "WITH RECURSIVE ancestor(id) AS ("
   "  VALUES(%d)"
-  "  UNION ALL"
+  "  UNION"
   "  SELECT pid FROM plink, ancestor"
   "   WHERE cid=ancestor.id AND pid!=%d AND cid!=%d)"
   "SELECT 1 FROM ancestor WHERE id=%d LIMIT 1",
   vid, nid, pid, pid
 ) ? 'p' : 'n';

-- 
D. Richard Hipp
d...@sqlite.org
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Infinite loop on merge

[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 release.

On Tue, Sep 6, 2016 at 2:11 PM, Richard Hipp  wrote:

> 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-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>



-- 
Andy Goth | 
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] Infinite loop on merge

[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
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users