Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Andy Bradford
Thus said David Mason on Wed, 11 Mar 2015 15:17:57 -0400: > Does that help at all? I tried these steps with Fossil from trunk and saw the files when I opened the Fossil. Any chance you could make up a test fossil using the above mentioned steps (and a fake student/user and TA) in

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Andy Bradford
Thus said Richard Hipp on Wed, 11 Mar 2015 14:32:18 -0400: > Brainstorming... Maybe something like this occurred: > >(1) Copy the original repository file into xyz.fossil >(2) run "fossil open xyz.fossil" >(3) Copy a revised version of the repository over top of xyz.fossil >(4

Re: [fossil-users] Xekri with small side-by-side diff

2015-03-11 Thread Richard Hipp
On 3/11/15, Andrew Moore wrote: > The branch "skin-xekri" has been updated with the font size change as well > as some other improvements based on an off-list conversation with Jungle. > Please check it out and let me know if there are any more requested > changes. > > Thank you Jungle, your input

Re: [fossil-users] hooks in Fossil

2015-03-11 Thread mario
Wed, 11 Mar 2015 13:29:13 +0100 Gour : > > Now, I'd like that whenever I commit changes on my local machine and > push them unto remote server, that the content of 'public' folder gets > copied/synced to the remote server to the specific directory so that > the site is automatically refreshed. >

Re: [fossil-users] hooks in Fossil

2015-03-11 Thread Abilio Marques
You can hook the commit: admin>transfers>commit , but you'll need a way to make it copy the files. I have a similar setup with LaTeX generating a PDF every time I commit a change to the source. For this purpose I built an exec command for TH1. By pure luck I've just sent a patch for my latest versi

Re: [fossil-users] TH1 exec

2015-03-11 Thread Abilio Marques
For those interested in a TH1 exec command, I took the ideas from Stephan and Ron, and mixed a few of my own. Here I present my latest version for the exec command I'm using. Now I directly call the functions already included in src/popen.c This time, it can take up to 3 parameters: *exec ?NOWAIT?

Re: [fossil-users] Xekri with small side-by-side diff

2015-03-11 Thread Andrew Moore
The branch "skin-xekri" has been updated with the font size change as well as some other improvements based on an off-list conversation with Jungle. Please check it out and let me know if there are any more requested changes. Thank you Jungle, your input was greatly appreciated! On Tue, Mar 10,

[fossil-users] Fossil Skins with help menu for 'nobody'

2015-03-11 Thread jungle Boogie
Hello All, Kind of a continuation of this thread: http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg19442.html Specifically regarding user permissions later on in the thread. The following skins have the help menu exposed even if user 'nobody' has no permissions: -Enhanced Default

Re: [fossil-users] Veracity Version control

2015-03-11 Thread Andy Bradford
Thus said Andy Goth on Wed, 11 Mar 2015 15:56:43 -0500: > > anonymous does have some privileges not inherited from nobody (hmncz) > > anonymous doesn't have z by default. No, but nobody does: https://www.fossil-scm.org/index.html/info/68ce0bcf6269988e Maybe what he really meant was that any u

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Andy Bradford
Thus said Richard Hipp on Wed, 11 Mar 2015 15:56:41 -0400: > That's an processing artifact of the graph generator. The 198f28add5 > check-in references some parent a09a968bf05 which is not in the tree, > so the graph generator just draws a line off the bottom of the page, > not knowing what e

Re: [fossil-users] Veracity Version control

2015-03-11 Thread Andy Goth
On 3/11/2015 2:08 PM, Graeme Pietersz wrote: > I just experimented with a new repo > > Even if nobody has no privileges, anonymous can login. True. Take away all of anonymous's capabilities to remove the ability for anonymous to log in. The documentation needs to be updated to say this clearly.

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Richard Hipp
On 3/11/15, Andy Bradford wrote: > > We're just eliminating all the obvious things. So, let me ask this... in > the PNG of the timeline you sent, why does your ``default setup'' commit > show up *after* the other timeline's first commit? > > According to your own steps, this should have happen

Re: [fossil-users] Veracity Version control

2015-03-11 Thread jungle Boogie
On 11 March 2015 at 12:26, Graeme Pietersz wrote: > .. but the developer and reader privileges still exist so the initial user > can easily add collaborators, > the effect would not be very different from a Github private repo >>> >>> Corporate = many users & different permissions > > Something li

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Richard Hipp
On 3/11/15, Andy Bradford wrote: > Thus said David Mason on Wed, 11 Mar 2015 15:17:57 -0400: > >> But I'm back. I could imagine one student doing some weird thing, but >> not a score of them with the same outcome. The directions were as I >> posted (without the bits in red). I would virtual

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Andy Bradford
Thus said David Mason on Wed, 11 Mar 2015 15:17:57 -0400: > But I'm back. I could imagine one student doing some weird thing, but > not a score of them with the same outcome. The directions were as I > posted (without the bits in red). I would virtually guarantee that > *none* of the stu

Re: [fossil-users] Veracity Version control

2015-03-11 Thread Graeme Pietersz
On 11/03/15 23:53, Andreas Kupries wrote: On Wed, Mar 11, 2015 at 11:16 AM, jungle Boogie wrote: Hi Andreas, On 11 March 2015 at 10:58, Andreas Kupries wrote: On Wed, Mar 11, 2015 at 10:34 AM, Richard Boehme wrote: I would be strongly in favor of presets in Fossil as everyone has outlined

Re: [fossil-users] Veracity Version control

2015-03-11 Thread jungle Boogie
Hi Andy, On 11 March 2015 at 11:49, jungle Boogie wrote: > Next time I'll actually run time but here's results with ^t in freeBSD: > > fossil commit -m "added 10 100MB binary files" > load: 0.37 cmd: fossil 6695 [runnable] 6.16r 3.18u 0.90s 32% 4924k > ./bigfile contains binary data. Use --no-war

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Andy Bradford
Thus said David Mason on Wed, 11 Mar 2015 11:07:11 -0400: > I have several students who, through some problem while cloning > the fossil I created for them, created a parallel timeline. (see > screenshot) Do you create the intial repository for the students? If so, do you initializ

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread David Mason
I'd virtually guarantee that 20 students - and only the ones running using the apt-get fossil - did not try the --empty switch. Unfortunately. And when I added tags to the empty timeline they were still not mergable. ../Dave On 11 March 2015 at 15:10, Andy Bradford wrote: > Thus said Richard H

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread David Mason
Thanks for all the imagining. (Sorry, I was off reading the latest episode of Harry Potter and the Methods of Rationality hpmor.com quite extraordinary!) But I'm back. I could imagine one student doing some weird thing, but not a score of them with the same outcome. The directions were as I

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Andy Bradford
Thus said Richard Hipp on Wed, 11 Mar 2015 12:48:04 -0400: > I'm still curious as to how the students managed to get the repo into > this state, too. This is possible if you open a repository using the --empty command line option. Basically, what you end up with when you do this are two DAGs in

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Andreas Kupries
On Wed, Mar 11, 2015 at 11:43 AM, Eric Rubin-Smith wrote: > > >> ... unless the students used raw SQL to hack there project-id to make >> it match the repository into which they were pushing. But I'm >> thinking that is not what happened here. > > > > Little anecdote. When I was a student we wer

Re: [fossil-users] Veracity Version control

2015-03-11 Thread jungle Boogie
Hi Any, On 10 March 2015 at 23:53, Andy Goth wrote: > On 3/11/2015 12:15 AM, jungle Boogie wrote: >> I created a test repo with a few commits: >> >> The commit of the 100 MB files took about 300 seconds but this ran on >> a single core 512MB-1gig RAM machine. >> >> I know this is unscientific but

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Eric Rubin-Smith
... unless the students used raw SQL to hack there project-id to make > it match the repository into which they were pushing. But I'm > thinking that is not what happened here. > Little anecdote. When I was a student we were using CVS for our "big project". One teammate couldn't understand why

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Richard Hipp
On 3/11/15, David Mason wrote: > As for what they did, it was a while ago that they set them up. There > was a problem that the students on Linux (typically ubuntu) didn't see > the stuff I had created for them (default .fossil-settings and > assignment directories), which sounds a lot like this

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Richard Hipp
On 3/11/15, Eric Rubin-Smith wrote: >> Are you sure your students didn't "shun" something or try to use >> "reconstruct"? >> > > What would happen if the student tried to push a repo that they had created > with 'fossil init' to the central clone? > The push would be refused. Every "fossil init"

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Eric Rubin-Smith
> Are you sure your students didn't "shun" something or try to use > "reconstruct"? > What would happen if the student tried to push a repo that they had created with 'fossil init' to the central clone? ___ fossil-users mailing list fossil-users@lists.fo

Re: [fossil-users] Veracity Version control

2015-03-11 Thread Andreas Kupries
On Wed, Mar 11, 2015 at 11:16 AM, jungle Boogie wrote: > Hi Andreas, > On 11 March 2015 at 10:58, Andreas Kupries wrote: >> On Wed, Mar 11, 2015 at 10:34 AM, Richard Boehme wrote: >>> I would be strongly in favor of presets in Fossil as everyone has outlined >>> >>> "open source" - everyone can

Re: [fossil-users] Veracity Version control

2015-03-11 Thread jungle Boogie
Hi Andreas, On 11 March 2015 at 10:58, Andreas Kupries wrote: > On Wed, Mar 11, 2015 at 10:34 AM, Richard Boehme wrote: >> I would be strongly in favor of presets in Fossil as everyone has outlined >> >> "open source" - everyone can read >> "corporate" - only registered users can read, and new us

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread David Mason
I've emailed the fossil to drh. That sequence of update and merge just toggled between timelines. I.e.: ADDED Fossils/A3.hs ADDED Fossils/a1.hs ADDED Fossils/a2-a2.hs ADDED Fossils/test DELETE .fossil-settings/allow-symlinks DELETE .fossil-settings/binary-glob DELETE .fossil-settings/clean-glob D

Re: [fossil-users] Veracity Version control

2015-03-11 Thread Andy Goth
On 3/11/2015 8:58 AM, Graeme Pietersz wrote: > On 11/03/15 12:25, Andy Goth wrote: >> All you have to do is take away all of nobody's privileges. >> >> f user capabilities nobody "" >> >> Can also be done with the web interface. > > And the same for anonymous surely? No need. anonymous inherits i

Re: [fossil-users] Veracity Version control

2015-03-11 Thread Richard Boehme
I would be strongly in favor of presets in Fossil as everyone has outlined "open source" - everyone can read "corporate" - only registered users can read, and new users have minimal permissions "private" - I'm unsure what this means. Comments? Thanks. Richard On 3/11/15, Ron W wrote: > On Wed

Re: [fossil-users] Veracity Version control

2015-03-11 Thread Ron W
On Wed, Mar 11, 2015 at 1:49 AM, Graeme Pietersz wrote: > > On 11/03/15 00:45, Ron W wrote: >> >> I'm thinking he wants 2 sets of default settings: The existing one (which >> he perceives as being open source oriented) and another set that are more >> appropriate for use by software teams within a

Re: [fossil-users] hooks in Fossil

2015-03-11 Thread Ron W
On Wed, Mar 11, 2015 at 8:29 AM, Gour wrote: > Now, I'd like that whenever I commit changes on my local machine and > push them unto remote server, that the content of 'public' folder gets > copied/synced to the remote server to the specific directory so that the > site is automatically refreshed

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Richard Hipp
On 3/11/15, Andreas Kupries wrote: > On Wed, Mar 11, 2015 at 8:25 AM, Richard Hipp wrote: >> On 3/11/15, David Mason wrote: >>> I have several students who, through some problem while cloning the >>> fossil I created for them, created a parallel timeline. (see >>> screenshot) >> >>> I want to me

Re: [fossil-users] Veracity Version control

2015-03-11 Thread Andreas Kupries
On Tue, Mar 10, 2015 at 12:15 PM, Ron W wrote: > On Tue, Mar 10, 2015 at 1:58 PM, jungle Boogie > wrote: >> -also isn’t a single-button way to switch the default settings of >> permissions to the repository from open-source (default) to private, >> corporate use. (No idea what this means) > > > I

Re: [fossil-users] How to fix parallel timeline

2015-03-11 Thread Richard Hipp
On 3/11/15, David Mason wrote: > I have several students who, through some problem while cloning the > fossil I created for them, created a parallel timeline. (see > screenshot) Fossil is suppose to be bullet-proof. I'd really like to know what your students did in order to get the repository in

Re: [fossil-users] Veracity Version control

2015-03-11 Thread Graeme Pietersz
On 11/03/15 12:25, Andy Goth wrote: On 3/11/2015 12:49 AM, Graeme Pietersz wrote: On 11/03/15 00:45, Ron W wrote: I'm thinking he wants 2 sets of default settings: The existing one (which he perceives as being open source oriented) and another set that are more appropriate for use by software

[fossil-users] hooks in Fossil

2015-03-11 Thread Gour
Hello, I'm using Hugo static-site-generator (SSG) to build my site and keep source files under Fossil. The repo looks like: top-level-dir | | ---> config.toml ---> content (dir) ---> ... (dirs) --> public (dir) where config.toml, content etc. are 'meta' data and the real static web site i

Re: [fossil-users] Veracity Version control

2015-03-11 Thread Joerg Sonnenberger
On Wed, Mar 11, 2015 at 01:53:36AM -0500, Andy Goth wrote: > On 3/11/2015 12:15 AM, jungle Boogie wrote: > > I created a test repo with a few commits: > > > > The commit of the 100 MB files took about 300 seconds but this ran on > > a single core 512MB-1gig RAM machine. > > > > I know this is uns