Re: [fossil-users] Timeline graph display options

2015-03-12 Thread Martin S. Weber
On 2015-03-09 21:42:51, Andy Bradford wrote:
 Thus said Richard Hipp on Mon, 09 Mar 2015 23:06:59 -0400:
 
  Which timeline graph do you prefer:
  
  (1) https://www.fossil-scm.org/fossil/timeline?y=cinomo=0
  (2) https://www.fossil-scm.org/fossil/timeline?y=cinomo=1
 
 (1) because the relationship to the node from which the arrow originates
 is more clear to me.
 

Same thought here.


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


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

2015-03-12 Thread jungle Boogie
Hello All,

Has anyone noticed if the Xekri doesn't pickup any modifications to its CSS?

The xx-small sidebyside diff is too small for me so I modify it by
just removing the xx- from the default and save, but when testing the
Xekri skin, the change didn't do anything.

My change:

}

/* side-by-side diff display (column-based) */
table.sbsdiffcols {
  width: 90%;
  border-spacing: 0;
  font-size: small;

}

Thanks,
jungle

-- 
---
inum: 883510009027723
sip: jungleboo...@sip2sip.info
xmpp: jungle-boo...@jit.si
___
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] Veracity Version control

2015-03-12 Thread Antoine Chavasse
I'd say that his problem is to use a DVCS with lots of data in binary files
(game assets). He's bound to run into trouble even with mercurial.

The idea of keeping everything is seducing and works extremely well for
source code because it's small and is easily deltaized and compressed,
but it's just not practical for large amounts of binary data.

Where I work (on some big open world game), we don't even store very
revision of binary files, only a dozen or so, and the older ones are
discarded. Our VCS is perforce, it allows to setup this kind of rule per
file type so we can say things such as only keep 10 revisions of png
files. The metadata for all revisions are kept, but the data itself is
thrown away.

On Tue, Mar 10, 2015 at 9:52 PM Ron W ronw.m...@gmail.com wrote:

 On Tue, Mar 10, 2015 at 4:37 PM, jungle Boogie jungleboog...@gmail.com
 wrote:

 On 10 March 2015 at 12:15, Ron W ronw.m...@gmail.com wrote:

  Seems to me that he doesn't realize that Fossil separates the repository
  from the working copy. He's expecting fossil clone to work like Git
 or
  Hg where the working copy is automatically created.

 Yes, exactly. It's a couple extra steps to open it up. If he's willing
 to leave Fossil because of that, oh well!


  I suspect the main reason was the problem with large files, whatever his
 threshold for large is. Not a limit I've run into, yet.

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

___
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 fix parallel timeline

2015-03-12 Thread Richard Hipp
On 3/11/15, David Mason dma...@ryerson.ca wrote:
 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
 DELETE .fossil-settings/ignore-glob
 DELETE .fossil-settings/ignore-glob.no-warn
 DELETE a1/.hold
 DELETE a2/.hold
 DELETE a3/.hold
 DELETE a4/.hold
 DELETE a5/.hold
 DELETE a6/.hold

Maybe this:

fossil up 33f9
fossil merge --baseline 198f28 094b

That gives:

ADDED Fossils/A3.hs
ADDED Fossils/a2-a2.hs


 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 problem.  I
 guess they were never working on trunk.  Perhaps if i'd told them to
 fossil update trunk it would have worked.

That should have been automatic when they first checked out the repo.


 The problem was that the version of fossil that apt-get used was
 version 1.27 (I think... maybe 1.29) and I created the fossils with
 1.30[a507dc7cf5] (and use 1.30[cf49528e5c] to look at them).  This is
 the resource page I point them at:
 http://cps506.sarg.ryerson.ca/Resources/fossil.html

1.27 should be completely compatible.  It lacks some of the newer
features, but should interoperate just fine.

Are you sure your students didn't shun something or try to use reconstruct?


 ../Dave

 On 11 March 2015 at 12:48, Richard Hipp d...@sqlite.org wrote:
 On 3/11/15, Andreas Kupries andre...@activestate.com wrote:
 On Wed, Mar 11, 2015 at 8:25 AM, Richard Hipp d...@sqlite.org wrote:
 On 3/11/15, David Mason dma...@ryerson.ca 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 merge them, but fossil merge says there's no head to merge.
 The commits by the student are on the right and are not tagged as
 trunk, but tagging them as such doesn't seem to help.  Using
 --baseline in merge didn't help either.

 I was about to suggest using --baseline.  What is the exact
 command-sequence that you used?  And how do you know it didn't work -
 did it give an error?

 I wonder if merging by exact sha-hash would work ?


 I'm looking at the source code, and I'm thinking that --baseline ought
 to work.  The command sequence should be:

 fossil update 33f9c5915f
 fossil merge 094b1b8a4d --baseline ce53290262

 I'm still curious as to how the students managed to get the repo into
 this state, too.  The only thing I can think of is that they had one
 or more check-ins in between ce53290262 and 198f28add5 that the
 shunned.  It makes me wonder if we ought not put more safety checks
 and harsher warnings on the shun command?

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



-- 
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] Veracity Version control

2015-03-12 Thread Graeme Pietersz



On 12/03/15 02:46, Andy Bradford wrote:

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 user  (not the Fossil Anonymous
user), can access /zip by default?

No. I created a new repo, ran

fossil user capabilities nobody 

added a file to the repo (zip downloads do not work on an empty repo) and:

fossil user capabilities anonymous

returns:

hmncz

furthermore /zip redirects to login when not logged in, returns the zip 
file if logged in as anonymous. I do seem to have 1.28 on this 
particular machine so it may be something that has been fixed since.


Andy
--
TAI64 timestamp: 40005500b0c1
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users



___
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] Veracity Version control

2015-03-12 Thread Graeme Pietersz



On 11/03/15 23:21, Andy Goth wrote:

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 its ability to log in from nobody.  Taking
away nobody's privileges also takes away anonymous's privileges.

I just experimented with a new repo

Even if nobody has no privileges, anonymous can login. It appears that 
it is still locked up as there are no useful links in the navigation, 
and the home page redirects to the  login page. However anonymous does 
have some privileges not inherited from nobody (hmncz) and these can be 
used by directly typing in the appropriate URLs. I have not tested 
everything, but I have verified the biggest weakness: anonymous can 
download a zip archive using the /zip url.





The user administration page says:

No login is required for user nobody.  The capabilities of the nobody
user are inherited by all users, regardless of whether or not they are
logged in.  To disable universal access to the repository, make sure
that the nobody user has no capabilities enabled.  The password for
nobody is ignored.

If you like, you can explicitly move nobody's privileges to anonymous so
that anonymous login is required.  You would do this to give every human
access but block spiders.

Login is required for user anonymous but the password is displayed on
the login screen beside the password entry box so anybody who can read
should be able to login as anonymous.  On the other hand, spiders and
web-crawlers will typically not be able to login.  Set the capabilities
of the anonymous user to things that you want any human to be able to
do, but not any spider.  Every other logged-in user inherits the
privileges of anonymous.



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


___
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] hooks in Fossil

2015-03-12 Thread Gour
Ron W ronw.m...@gmail.com writes:

 Another possibility might be RSS. I recall reading on this list where some
 have set up build servers, such as Jenkins, that monitor the Fossil RSS
 feed.

I believe that's too complicated considering that atm I'm the only one
generating the content...


Sincerely,
Gour

-- 


___
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 fix parallel timeline

2015-03-12 Thread Tontyna

Am 11.03.2015 um 18:48 schrieb David Mason:

The problem was that the version of fossil that apt-get used was
version 1.27 (I think... maybe 1.29) and I created the fossils with
1.30[a507dc7cf5] (and use 1.30[cf49528e5c] to look at them).  This is
the resource page I point them at:


Can't imagine how your students were able to work with 1.27 on a 
repository created with 1.30 without doing a fossil rebuild


With 1.29 I'm not even able to open the 1.30 repo.
With 1.27 I can open the cloned repo but cannot add files.

Managed to reproduce your corrupted timeline:

1. Created a repo with Fossil 1.30
2. Switched to Fossil 1.27
3. clone/open worked without warning
   BTW: open produced a _FOSSIL_ but the local reposirory was empty,
   i.e no checked-out files at all
4. created a new file
5. `fossil add` warned me about the wrong schema version
6. did what I was told: `fossil rebuild`
7. Now `add .` worked fine
8. `commit` warned me about autosync not working
   I ignored that an continued.
9. fossil ui/timeline -- see attached picture

___
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 fix parallel timeline

2015-03-12 Thread Richard Hipp
On 3/12/15, Tontyna tont...@ultrareal.de wrote:
 Am 11.03.2015 um 18:48 schrieb David Mason:
 The problem was that the version of fossil that apt-get used was
 version 1.27 (I think... maybe 1.29) and I created the fossils with
 1.30[a507dc7cf5] (and use 1.30[cf49528e5c] to look at them).  This is
 the resource page I point them at:

 Can't imagine how your students were able to work with 1.27 on a
 repository created with 1.30 without doing a fossil rebuild

 With 1.29 I'm not even able to open the 1.30 repo.
 With 1.27 I can open the cloned repo but cannot add files.

Thanks Tontyna.  I can repro the problem now too.

I have some other unrelated issues to deal with first.  But I will
soon be making some important and sad announcements in connection with
this whole affair.


 Managed to reproduce your corrupted timeline:

 1. Created a repo with Fossil 1.30
 2. Switched to Fossil 1.27
 3. clone/open worked without warning
 BTW: open produced a _FOSSIL_ but the local reposirory was empty,
 i.e no checked-out files at all
 4. created a new file
 5. `fossil add` warned me about the wrong schema version
 6. did what I was told: `fossil rebuild`
 7. Now `add .` worked fine
 8. `commit` warned me about autosync not working
 I ignored that an continued.
 9. fossil ui/timeline -- see attached picture




-- 
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] How to fix parallel timeline

2015-03-12 Thread Richard Hipp
On 3/12/15, David Mason dma...@ryerson.ca wrote:
 Thanks Tontyna!

 I was going to do what you tried, today, but I really appreciate you
 confirming it.

 It is certainly possible that the students would do a fossil rebuild
 if fossil told them to.  The odds of 20 of them doing that if not told
 are very low.

The fossil rebuild is not necessary.  All they have to do is use
Fossil 1.27 to clone a repo that was created with Fossil 1.30.

-- 
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] How to fix parallel timeline

2015-03-12 Thread Richard Hipp
On 3/12/15, Jan Nijtmans jan.nijtm...@gmail.com wrote:

 Much better, preventing the problem all together: create the
 repository with Fossil 1.27 to begin with. Fossil 1.30 had
 bugs which ill-treat repositories without any commits. Those
 were fixed in Fossil 1.30.


Just to be clear:  Those changes that allow one to create a repo that
has no commits - they are going to be backed out just as soon as I get
the opportunity.
-- 
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] How to fix parallel timeline

2015-03-12 Thread David Mason
Thanks Tontyna!

I was going to do what you tried, today, but I really appreciate you
confirming it.

It is certainly possible that the students would do a fossil rebuild
if fossil told them to.  The odds of 20 of them doing that if not told
are very low.

../Dave

On 12 March 2015 at 06:40, Tontyna tont...@ultrareal.de wrote:
 Am 11.03.2015 um 18:48 schrieb David Mason:

 The problem was that the version of fossil that apt-get used was
 version 1.27 (I think... maybe 1.29) and I created the fossils with
 1.30[a507dc7cf5] (and use 1.30[cf49528e5c] to look at them).  This is
 the resource page I point them at:


 Can't imagine how your students were able to work with 1.27 on a repository
 created with 1.30 without doing a fossil rebuild

 With 1.29 I'm not even able to open the 1.30 repo.
 With 1.27 I can open the cloned repo but cannot add files.

 Managed to reproduce your corrupted timeline:

 1. Created a repo with Fossil 1.30
 2. Switched to Fossil 1.27
 3. clone/open worked without warning
BTW: open produced a _FOSSIL_ but the local reposirory was empty,
i.e no checked-out files at all
 4. created a new file
 5. `fossil add` warned me about the wrong schema version
 6. did what I was told: `fossil rebuild`
 7. Now `add .` worked fine
 8. `commit` warned me about autosync not working
I ignored that an continued.
 9. fossil ui/timeline -- see attached picture


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

___
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 fix parallel timeline

2015-03-12 Thread Jan Nijtmans
2015-03-12 15:22 GMT+01:00 Richard Hipp d...@sqlite.org:
 The fossil rebuild is not necessary.  All they have to do is use
 Fossil 1.27 to clone a repo that was created with Fossil 1.30.

Much better, preventing the problem all together: create the
repository with Fossil 1.27 to begin with. Fossil 1.30 had
bugs which ill-treat repositories without any commits. Those
were fixed in Fossil 1.30.

A workaround: If you really want to create the initial repository
with Fossil 1.30, use fossil new --date-override now.

Regards,
  Jan Nijtmans
___
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] Google code shutting down

2015-03-12 Thread jungle Boogie
Hi Warren,
On 12 March 2015 at 19:36, Warren Young w...@etr-usa.com wrote:
 On Mar 12, 2015, at 7:47 PM, jungle Boogie jungleboog...@gmail.com wrote:

 Hopefully some converts will check out the Fossil project.

 Unlikely.  They’re offering an automated migration path to GitHub:

   https://code.google.com/export-to-github/

 The manual migration path recipes Google are providing don’t mention Fossil:

   https://code.google.com/p/support-tools/


Yes, I'm being optimistic about the userbase but we must agree Fossil
to much easier and friendlier to use.

-- 
---
inum: 883510009027723
sip: jungleboo...@sip2sip.info
xmpp: jungle-boo...@jit.si
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


[fossil-users] Fixing search results

2015-03-12 Thread Steve Stefanovich

So no reactions about search changes suggestions? It would be good to fix 3. 
and 4. at least, if 1. is too difficult. (5. is for further discussion)

S.

From: Steve Stefanovich‎
Sent: Wednesday, 11 March 2015 14:18‎
To: Fossil SCM user's discussion
Subject: Displaying new search results


‎The new search functionality is awesome and quick - thanks, drh. It is a huge 
step forward to make Fossil usable for non-programmers, i.e. GUI-only users 
(managers, testers, documentation writers).

It's not quite there yet, IMHO. drh - and other valued contributors - what do 
you think about fixing or improving the following:

(Fossil 1.31 Win binary‎, /search page)

1. How about displaying the search results in table with sortable columns, 
similar to /brlist and ticket reports? Suggested columns would be mtime, type 
(doc/check-in/ticket etc.), creator username, filename (wiki title, ticket 
subject) and search hit snippet. (Add commit hash if 5. below is implemented).

This would cater for much more common use case where you can't remember - or 
don't know - the 'unique enough' search keywor‎d(s) to get relevant hits, but 
you do know a person who updated the content or roughly when it was done. By 
sorting on columns you can quickly zoom in on what's relevant even if there are 
lots of search hits due to common keyword.

2. Include search on full path filenames too. Sometimes I'm interested in 
specific file, but remember only roughly what it is called or where is it 
located. This would be even more useful if search can traverse commits and show 
deleted/renamed versions as well; sometimes I know there was a file with 'foo' 
in its name that I can't find anymore because someone has deleted or renamed it.

3. If the file extension is not wiki, the hyperlink to go to contains the first 
line of the file instead of the filename. So if I enable search of the source 
code by adding, say *.c in search admin page, instead of the full path 
filenames being displayed, I get the first line of the comment or copyright 
notice. It should be full path filename.

4. The search result hyperlinks should have the ?mimetype=text/plain suffix 
always set, otherwise if they are not wikis, then ‎they get served as 
downloads. It is more conceivable that I'd want to look at the file content 
instead. If I need to download, I can always quickly delete the suffix and get 
it.

5. Search over past commits.  This probably deserves a separate discussion on 
its own. I hope that if it can be invoked with params that limit the keyword 
search on file extension, tag, date or number of hits, it can work fast enough 
even as full text search.  The challenge would be how to display the context 
for different use cases.

Thanks for Fossil, it is really useful software.

Cheers,
Steve



___
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] Google code shutting down

2015-03-12 Thread bch
*preaching

Yay, auto-spell.
On Mar 12, 2015 10:04 PM, bch brad.har...@gmail.com wrote:


 On Mar 12, 2015 7:47 PM, jungle Boogie jungleboog...@gmail.com wrote:
 
  Hi Warren,
  On 12 March 2015 at 19:36, Warren Young w...@etr-usa.com wrote:
   On Mar 12, 2015, at 7:47 PM, jungle Boogie jungleboog...@gmail.com
 wrote:
  
   Hopefully some converts will check out the Fossil project.
  
   Unlikely.  They're offering an automated migration path to GitHub:
  
 https://code.google.com/export-to-github/
  
   The manual migration path recipes Google are providing don't mention
 Fossil:
  
 https://code.google.com/p/support-tools/
 
 
  Yes, I'm being optimistic about the userbase but we must agree Fossil
  to much easier and friendlier to use.

 You're packing to the choir on a fossil mailing list ;)

 Write up on Twitter, FB, etc for full effect.

  --
  ---
  inum: 883510009027723
  sip: jungleboo...@sip2sip.info
  xmpp: jungle-boo...@jit.si
  ___
  fossil-users mailing list
  fossil-users@lists.fossil-scm.org
  http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

___
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] Google code shutting down

2015-03-12 Thread bch
On Mar 12, 2015 7:47 PM, jungle Boogie jungleboog...@gmail.com wrote:

 Hi Warren,
 On 12 March 2015 at 19:36, Warren Young w...@etr-usa.com wrote:
  On Mar 12, 2015, at 7:47 PM, jungle Boogie jungleboog...@gmail.com
wrote:
 
  Hopefully some converts will check out the Fossil project.
 
  Unlikely.  They're offering an automated migration path to GitHub:
 
https://code.google.com/export-to-github/
 
  The manual migration path recipes Google are providing don't mention
Fossil:
 
https://code.google.com/p/support-tools/


 Yes, I'm being optimistic about the userbase but we must agree Fossil
 to much easier and friendlier to use.

You're packing to the choir on a fossil mailing list ;)

Write up on Twitter, FB, etc for full effect.

 --
 ---
 inum: 883510009027723
 sip: jungleboo...@sip2sip.info
 xmpp: jungle-boo...@jit.si
 ___
 fossil-users mailing list
 fossil-users@lists.fossil-scm.org
 http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
___
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] Google code shutting down

2015-03-12 Thread Warren Young
On Mar 12, 2015, at 7:47 PM, jungle Boogie jungleboog...@gmail.com wrote:
 
 Hopefully some converts will check out the Fossil project.

Unlikely.  They’re offering an automated migration path to GitHub:

  https://code.google.com/export-to-github/

The manual migration path recipes Google are providing don’t mention Fossil:

  https://code.google.com/p/support-tools/
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


[fossil-users] Theme dependencies, CLA, BSD licensing

2015-03-12 Thread James Moger
Hi Fossil Community,

I have a question regarding how to proceed with contributing a theme which
may have (embedded) dependencies that are not original works of the theme
author.  There is a long-standing tradition of building on the works of
others and it's not clear to me how that dovetails with Fossil's CLA.

For example, I'm working on a theme for which I am using Normalize.css[1]
to ensure I start off at a consistent point across browsers.  Normalize.css
is MIT licensed - at least I think so[2] - and is the baseline for many CSS
frameworks.

Obviously, Normalize.css is not my own work so I could not grant/share
copyright on behalf of the Normalize.css authors with Hwaci.  And my
inquiry is not just about a Normalize.css dependency, but it serves as a
good example.

I would appreciate any guidance you could provide.

-J


[1]: https://necolas.github.io/normalize.css/
[2]: https://github.com/necolas/normalize.css/blob/master/LICENSE.md
___
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] Theme dependencies, CLA, BSD licensing

2015-03-12 Thread Richard Hipp
On 3/12/15, James Moger james.mo...@gmail.com wrote:
 Hi Fossil Community,

 I have a question regarding how to proceed with contributing a theme which
 may have (embedded) dependencies that are not original works of the theme
 author.  There is a long-standing tradition of building on the works of
 others and it's not clear to me how that dovetails with Fossil's CLA.

 For example, I'm working on a theme for which I am using Normalize.css[1]
 to ensure I start off at a consistent point across browsers.  Normalize.css
 is MIT licensed - at least I think so[2] - and is the baseline for many CSS
 frameworks.

I think it is sufficient to include the Normalize MIT license
statement in the CSS source text.  If I'm reading it correctly, that
satisfies all requirements of the MIT license.


 Obviously, Normalize.css is not my own work so I could not grant/share
 copyright on behalf of the Normalize.css authors with Hwaci.  And my
 inquiry is not just about a Normalize.css dependency, but it serves as a
 good example.

 I would appreciate any guidance you could provide.

 -J


 [1]: https://necolas.github.io/normalize.css/
 [2]: https://github.com/necolas/normalize.css/blob/master/LICENSE.md



-- 
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] hooks in Fossil

2015-03-12 Thread Ron W
On Thu, Mar 12, 2015 at 5:48 AM, Gour g...@atmarama.net wrote:

 Ron W ronw.m...@gmail.com writes:

  Another possibility might be RSS. I recall reading on this list where
 some
  have set up build servers, such as Jenkins, that monitor the Fossil RSS
  feed.

 I believe that's too complicated considering that atm I'm the only one
 generating the content...


While a build server is probably too complicated, a web content updater
could be something like:

#!/usr/bin/bash
$PREVIOUS=/path/to/a/file
$CURRENT=/path/to/another/file
$INTERVAL=300 # time, in seconds, between checks for available updates
while (1)
do
  wget 'http://localhost:8080/timeline.rss?r=trunkn=1' | grep 'guid'
$CURRENT
cmp -s $PREVIOUS $CURRENT
if [ $? -ne 0 ] # might need to be -eq instead of -ne (FYI: These are
numeric compare in Bash)
then
fossil update
rsync ./public $WWW/public # only needed if not serving directly from the
check-out
mv $CURRENT $PREVIOUS
fi
sleep $INTERVAL
od
___
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 fix parallel timeline

2015-03-12 Thread David Mason
The repository provided to the students *did* have commits:
.fossil-settings with 4+ files and 6 directories with .hold files in
them.  But maybe what you're saying is that something post-1.27 to
support that caused other problems.

../Dave

On 12 March 2015 at 10:34, Richard Hipp d...@sqlite.org wrote:
 On 3/12/15, Jan Nijtmans jan.nijtm...@gmail.com wrote:

 Much better, preventing the problem all together: create the
 repository with Fossil 1.27 to begin with. Fossil 1.30 had
 bugs which ill-treat repositories without any commits. Those
 were fixed in Fossil 1.30.


 Just to be clear:  Those changes that allow one to create a repo that
 has no commits - they are going to be backed out just as soon as I get
 the opportunity.
 --
 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
___
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] Theme dependencies, CLA, BSD licensing

2015-03-12 Thread James Moger
I'll mail you one anyway as I may want to share example code changes to
improve generated html and who knows what else. :)

-J

On Thu, Mar 12, 2015 at 12:56 PM, Richard Hipp d...@sqlite.org wrote:

 On 3/12/15, James Moger james.mo...@gmail.com wrote:
  Beautiful.  I will assume this answer would apply to other MIT licensed
  dependencies.
 
  @Richard: Is there an online version of your CLA?  Or do you require a
  mailed copy?
 

 On-line CLA at
 https://www.fossil-scm.org/fossil/doc/trunk/www/copyright-release.html

 For algorithmic code, I ask for hard-copy.  But for themes  and skins,
 an email scan is sufficient.  Thanks for wanting to contribute!

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

___
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] Theme dependencies, CLA, BSD licensing

2015-03-12 Thread James Moger
Beautiful.  I will assume this answer would apply to other MIT licensed
dependencies.

@Richard: Is there an online version of your CLA?  Or do you require a
mailed copy?

-J


On Thu, Mar 12, 2015 at 12:40 PM, Richard Hipp d...@sqlite.org wrote:

 On 3/12/15, James Moger james.mo...@gmail.com wrote:
  Hi Fossil Community,
 
  I have a question regarding how to proceed with contributing a theme
 which
  may have (embedded) dependencies that are not original works of the theme
  author.  There is a long-standing tradition of building on the works of
  others and it's not clear to me how that dovetails with Fossil's CLA.
 
  For example, I'm working on a theme for which I am using Normalize.css[1]
  to ensure I start off at a consistent point across browsers.
 Normalize.css
  is MIT licensed - at least I think so[2] - and is the baseline for many
 CSS
  frameworks.

 I think it is sufficient to include the Normalize MIT license
 statement in the CSS source text.  If I'm reading it correctly, that
 satisfies all requirements of the MIT license.

 
  Obviously, Normalize.css is not my own work so I could not grant/share
  copyright on behalf of the Normalize.css authors with Hwaci.  And my
  inquiry is not just about a Normalize.css dependency, but it serves as a
  good example.
 
  I would appreciate any guidance you could provide.
 
  -J
 
 
  [1]: https://necolas.github.io/normalize.css/
  [2]: https://github.com/necolas/normalize.css/blob/master/LICENSE.md
 


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

___
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 fix parallel timeline

2015-03-12 Thread Andy Bradford
Thus said Tontyna on Thu, 12 Mar 2015 11:40:32 +0100:

 1. Created a repo with Fossil 1.30
 2. Switched to Fossil 1.27
 3. clone/open worked without warning
 BTW: open produced a _FOSSIL_ but the local reposirory was empty,
 i.e no checked-out files at all

According  to David's  instructions[1], there  were files  added to  the
repository before it was made available for cloning to the students...

Does this still happen if you add files prior to cloning?

I suppose it's  possible that there are some missing  steps from David's
instructions?

[1] http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg19480.html

Thanks,

Andy
--
TAI64 timestamp: 40005501cc3f
___
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] Theme dependencies, CLA, BSD licensing

2015-03-12 Thread Richard Hipp
On 3/12/15, James Moger james.mo...@gmail.com wrote:
 Beautiful.  I will assume this answer would apply to other MIT licensed
 dependencies.

 @Richard: Is there an online version of your CLA?  Or do you require a
 mailed copy?


On-line CLA at 
https://www.fossil-scm.org/fossil/doc/trunk/www/copyright-release.html

For algorithmic code, I ask for hard-copy.  But for themes  and skins,
an email scan is sufficient.  Thanks for wanting to contribute!

-- 
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] How to fix parallel timeline

2015-03-12 Thread Richard Hipp
On 3/12/15, David Mason dma...@ryerson.ca wrote:
 The repository provided to the students *did* have commits:
 .fossil-settings with 4+ files and 6 directories with .hold files in
 them.  But maybe what you're saying is that something post-1.27 to
 support that caused other problems.

Version 1.29 introduced changes in the way the fossil init command
constructed a repository, which violated assumptions about the
repository layout that version 1.27 and earlier had made, apparently.
I am currently fuzzy on the details.

I have not yet freed up enough time to dig deeper into the issue.  We
know that if you stick to use the latest versions of Fossil everything
will work fine.  I don't yet know the specific cause of the confusion
in version 1.27.  I have important clients who are requesting
expedited enhancements to SQLite right now and I need to deal with
those requests first, but I will get back to a detailed analysis of
this problem as quickly as I can.
-- 
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] How to fix parallel timeline

2015-03-12 Thread David Mason
No I copied the script that creates the fossils directly into that
email, and apart from the warning in red, the instructions to students
are unchanged.  The odd student might do something different, but most
will have done only and exactly what the instructions say.

../Dave

On 12 March 2015 at 13:25, Andy Bradford amb-fos...@bradfords.org wrote:
 Thus said Tontyna on Thu, 12 Mar 2015 11:40:32 +0100:

 1. Created a repo with Fossil 1.30
 2. Switched to Fossil 1.27
 3. clone/open worked without warning
 BTW: open produced a _FOSSIL_ but the local reposirory was empty,
 i.e no checked-out files at all

 According  to David's  instructions[1], there  were files  added to  the
 repository before it was made available for cloning to the students...

 Does this still happen if you add files prior to cloning?

 I suppose it's  possible that there are some missing  steps from David's
 instructions?

 [1] 
 http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg19480.html

 Thanks,

 Andy
 --
 TAI64 timestamp: 40005501cc3f
 ___
 fossil-users mailing list
 fossil-users@lists.fossil-scm.org
 http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
___
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 fix parallel timeline

2015-03-12 Thread Tontyna

Am 12.03.2015 um 18:25 schrieb Andy Bradford:

Thus said Tontyna on Thu, 12 Mar 2015 11:40:32 +0100:


1. Created a repo with Fossil 1.30


forgot to mention: added a file and committed


2. Switched to Fossil 1.27
3. clone/open worked without warning
 BTW: open produced a _FOSSIL_ but the local reposirory was empty,
 i.e no checked-out files at all


According  to David's  instructions[1], there  were files  added to  the
repository before it was made available for cloning to the students...

Does this still happen if you add files prior to cloning?



The repo I created with 1.30 contained one file but as I said: after 
open (seemingly successfully because I got no warnings) the local root

was empty besides the _FOSSIL_ database.

Don't know what `fossil rebuild` does with the repository (downgrading 
1.30 to 1.27? How? What has `clone` done already?) but the parallel 
timeline definitely has something to do with the initial commit -- the 
clone contains 1 checkin, the above mentioned file (btw. Dave's 'default 
setup' files). Maybe when Fossil 1.27 sees the 1 it thinks: Oh, 
that's a repo containing nothing but the initial empty commit which we 
abandoned in version 1.30 but I don't know nuthin about 1.30. and gets 
tangled up.


Because surprise! When I did the same with an EMPTY master repository or 
a master containing MORE THAN ONE commit -- no parallel timeline. 
Everything is working as expected.


Except of course autosync fails when committing: Error: database schema 
is out-of-date on the server -- I'm wondering why your students who 
apparently read Fossil's output (and did a `rebuild` accordingly) didn't 
notify you of that. Or did you turn off autosync?



Q: Is it worth investigating this issue? How could/should one make 
previous versions forward-compatible? Current and future versions could 
probably refuse to rebuild a repo with a newer schema...


To reproduce Dave's timeline I was happy to still get Fossil 1.27 from 
the download page, but --- I think Fossil  1.30 should be removed from 
there or at least be tagged as don't use it with newer repos.


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


[fossil-users] Google code shutting down

2015-03-12 Thread jungle Boogie
Hello All,

If no one has heard this yet:
Google Code is to join the long list of Google projects that have been
consigned to the dustbin of history. The open source project hosting
service will no longer be accepting new project submissions as of
today, will no longer be accepting updates to existing projects from
August 24, and will be closed entirely on January 25, 2016.

http://arstechnica.com/information-technology/2015/03/google-to-close-google-code-open-source-project-hosting/


Just another reason to use Fossil since you run it yourself and its
super easy. Hopefully some converts will check out the Fossil project.

-- 
---
inum: 883510009027723
sip: jungleboo...@sip2sip.info
xmpp: jungle-boo...@jit.si
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


[fossil-users] Veracity Version control

2015-03-12 Thread jungle Boogie
Hello All,

Not that I'm even remotely interested in project, but I thought I'd
share it because it's so similar to Fossil:
http://veracity-scm.com/

I'm thinking it's a dead project as there are no releases for nearly
two years and the mailing list is dead.

From the little information on the site, it may have some kind of
project management functionality built in but other than that, Fossil
looks like the much better offering.

Has anyone ever used Veracity?

-- 
---
inum: 883510009027723
sip: jungleboo...@sip2sip.info
xmpp: jungle-boo...@jit.si
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


[fossil-users] How to fix parallel timeline

2015-03-12 Thread David Mason
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 merge them, but fossil merge says there's no head to merge.
The commits by the student are on the right and are not tagged as
trunk, but tagging them as such doesn't seem to help.  Using
--baseline in merge didn't help either.

Any help to merge these timeline much appreciated.

../Dave
___
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] Veracity Version control

2015-03-12 Thread Joe Prostko
On Tue, Mar 10, 2015 at 12:55 PM, jungle Boogie jungleboog...@gmail.com
wrote:

 Has anyone ever used Veracity?

I used it very briefly, but ended up going to Fossil.  The one guy behind
it also wrote a book about VCSs called Version Control By Example 
http://ericsink.com/vcbe/ that compares a given situation (team working on
files, merges, conflicts/resolution, etc.) with each different VCS and how
they compare.  It also gives a lot of VCS theory about how they work and
common terminology.  Fossil is mentioned in one sentence, basically saying
it is interesting with new ideas.

I think Veracity could have gotten a decent amount of traction if it wasn't
essentially abandoned, but as you mentioned, it seems like the project is
mostly or entirely dead at this point.

- joe
___
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 fix parallel timeline

2015-03-12 Thread Andreas Kupries
On Wed, Mar 11, 2015 at 8:25 AM, Richard Hipp d...@sqlite.org wrote:
 On 3/11/15, David Mason dma...@ryerson.ca 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 merge them, but fossil merge says there's no head to merge.
 The commits by the student are on the right and are not tagged as
 trunk, but tagging them as such doesn't seem to help.  Using
 --baseline in merge didn't help either.

 I was about to suggest using --baseline.  What is the exact
 command-sequence that you used?  And how do you know it didn't work -
 did it give an error?

I wonder if merging by exact sha-hash would work ?


-- 
Andreas Kupries
Senior Tcl Developer
Code to Cloud: Smarter, Safer, Faster™
F: 778.786.1133
andre...@activestate.com, http://www.activestate.com
Learn about Stackato for Private PaaS: http://www.activestate.com/stackato
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users