Re: [fossil-users] Gentoo: SQLITE_WARNING... best approach for Portage
On Wed, Nov 20, 2013 at 6:42 AM, Andy Bradford amb-fos...@bradfords.orgwrote: Thus said John L. Poole on Tue, 19 Nov 2013 05:12:08 -0800: The reason I'm writing to this list is to inquire if there will be a new release coming shortly or if I should try to create an ebuild that incorporates the patch that fixes this problem? I think it would be safest just to wait for the next release. Here are some issues you'll need to consider if you go the patch route: ... 3) To avoid 2, you can merge/commit the patch into a private branch in a cloned copy of the fossil repository. Then extract the patch from there as a diff from the official released version and your branch. Good morning! If the patch is relatively small, please just paste it to the list (don't attach it - attachments get stripped). i don't see the prior mail explaining the problem - maybe it already contains the patch? I don't know when the next official release will be, but this will give you an idea of the historical trend: Nobody knows - historically we release them when the changelog gets unusually long or when something truly critical was fixed. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal Since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do. -- Bigby Wolf ___ 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] how to re-open trunk?
On Wed, Nov 20, 2013 at 6:24 AM, Ben Collver bencoll...@gmail.com wrote: The good news is that the latest commit a6bf272559 is back in trunk, it is labeled as a leaf in the timeline, and it is back on the Open leaves page. The bad news is that trunk is still listed on the Closed Branches page. Is there a way to recompute the open branches? Good morning! IIRC (but i might be misremembering) the open branches can be recomputed by running 'fossil rebuild' (which is a harmless op - it never hurts to run it). Something little voice in the back of my mind is saying that that's not right, but i'm up to my ears in JBoss cluster installations and can't go poke around the sources right now :/. Please try a rebuild and what Andy proposed, in either order, and set the system clock to avoid other (unrelated) problems, and let us know how that goes. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal Since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do. -- Bigby Wolf ___ 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] Gentoo: SQLITE_WARNING... best approach for Portage
Thus said Stephan Beal on Wed, 20 Nov 2013 10:24:02 +0100: If the patch is relatively small, please just paste it to the list (don't attach it - attachments get stripped). i don't see the prior mail explaining the problem - maybe it already contains the patch? The patch is already in Fossil: http://www.fossil-scm.org/index.html/info/e65162b4ad He is looking for the best way to get this patch applied against version-1.27 and integrated into Gentoo's Portage so it gets included with their builds. Andy -- TAI64 timestamp: 4000528cd0ed ___ 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] how to re-open trunk?
On Tue, Nov 19, 2013 at 11:35:39PM -0700, Andy Bradford wrote: Thus said Andy Bradford on 19 Nov 2013 23:18:40 -0700: Thus said Ben Collver on Tue, 19 Nov 2013 21:24:33 -0800: * Edit commit faf2ad2219 * Start new branch trunk You need to also edit 816b791510bd638d and add the trunk branch there. You will also want to edit 1b524f8b49, a242a0a019, and 5080e9080d to remove the trunk tag from there (not the branch). Thank you, that is what I missed. It looks like the start of your problem were the edits to the trunk here: http://code.rogueclass.org/rcl/timeline?n=30b=2013-09-16+05:33:49 Notice that you edited faf2ad2219 and removed the branch tag. I believe what you really intended to do was edit 5080e9080d make it the start of a new branch. As I recall it, I: 1) started a new branch sdl2-egl-fbcon on commit faf2ad2219 2) realized that I wanted commit 5080e9080d instead 3) edited commit faf2ad2219 to cancel the sdl2-egl-fbcon branch I think this also canceled trunk, but I am not sure why. 4) started a new branch sdl2-egl-fbcon on commit 5080e9080d 5) took a while to realize that trunk had been canceled It seems that all is well now. Thanks for the help! -Ben p.s. Every time I reboot the VM, the clock goes way off. I corrected this by configuring the VM to use UTC instead of local time. ___ 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] Gentoo: SQLITE_WARNING... best approach for Portage
On Wed, Nov 20, 2013 at 4:10 PM, Andy Bradford amb-fos...@bradfords.orgwrote: Thus said Stephan Beal on Wed, 20 Nov 2013 10:24:02 +0100: If the patch is relatively small, please just paste it to the list (don't attach it - attachments get stripped). i don't see the prior mail explaining the problem - maybe it already contains the patch? The patch is already in Fossil: http://www.fossil-scm.org/index.html/info/e65162b4ad Ah, i've missed so much traffic/context recently :(. IIRC, Richard tweaked that fix at some point: http://www.fossil-scm.org/index.html/vdiff?from=e65162b4ad664ae37to=aef638b61003fcf2sbs=1 search that for main.c and you'll see that line 1185 from e65162 was removed later on. i.e. the patch for Gentoo should probably look a little bit different now. As for how best to feed that into their build process... no idea :/. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal Since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do. -- Bigby Wolf ___ 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] how to re-open trunk?
On Wed, Nov 20, 2013 at 10:40:32AM +0100, Stephan Beal wrote: Good morning! IIRC (but i might be misremembering) the open branches can be recomputed by running 'fossil rebuild' (which is a harmless op - it never hurts to run it). Something little voice in the back of my mind is saying that that's not right, but i'm up to my ears in JBoss cluster installations and can't go poke around the sources right now :/. Please try a rebuild and what Andy proposed, in either order, and set the system clock to avoid other (unrelated) problems, and let us know how that goes. Hi Stephan, Thank you for the advice. It worked out great. Cheers, -Ben ___ 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] Gentoo: SQLITE_WARNING... best approach for Portage
On 20 Nov 2013 16:40, Stephan Beal sgb...@googlemail.com wrote: On Wed, Nov 20, 2013 at 4:10 PM, Andy Bradford amb-fos...@bradfords.org wrote: Thus said Stephan Beal on Wed, 20 Nov 2013 10:24:02 +0100: If the patch is relatively small, please just paste it to the list (don't attach it - attachments get stripped). i don't see the prior mail explaining the problem - maybe it already contains the patch? The patch is already in Fossil: http://www.fossil-scm.org/index.html/info/e65162b4ad Ah, i've missed so much traffic/context recently :(. IIRC, Richard tweaked that fix at some point: http://www.fossil-scm.org/index.html/vdiff?from=e65162b4ad664ae37to=aef638b61003fcf2sbs=1 search that for main.c and you'll see that line 1185 from e65162 was removed later on. i.e. the patch for Gentoo should probably look a little bit different now. As for how best to feed that into their build process... no idea :/. -- - stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal Since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do. -- Bigby Wolf ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users Considering fossil releases are relatively rare and fossil trunk is generally in a good state, I would suggest picking the current trunk head and update the version on a regular basis if fixes that are of interest for Gentoo users are merged with trunk. ___ 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] hide-diff-on-vdiff branch
Thus said Martin Gagnon on Tue, 12 Nov 2013 23:26:59 -0500: The vdiff page is more propitious to generate big diff since it can cover many checkins, so I think it's logical to have the option to hide detailed diff of the whole checkin by default. Does anyone have any objections integrating this very small change to the trunk ? I found that I would have liked this ability today, but it wasn't there, so +1 from me. Andy -- TAI64 timestamp: 4000528d6407 ___ 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] hide-diff-on-vdiff branch
It looks ready for trunk to me. -- Joe Mistachkin ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
