Re: [fossil-users] File contains invalid UTF-8, but is not UTF-8.

2014-07-10 Thread Jan Nijtmans
2014-07-09 0:05 GMT+02:00 Andy Bradford amb-fos...@bradfords.org: Or perhaps just making the documentation more clear that all files must be valid UTF-8. Oh no, fossil doesn't require at all that all files are valid UTF-8. Only fossil ui assumes UTF-8 encoding for non-binary files, otherwise

Re: [fossil-users] [fossil extras] versus symlinks

2014-07-10 Thread Jan Nijtmans
2014-07-10 5:02 GMT+02:00 Timothy Beyer bey...@fastmail.net: I agree that is a terrifying behavior for the clean command, at least as a default (and _ESPECIALLY_ without undo). There is an undo-clean branch in fossil which implements an undo-able fossil clean:

Re: [fossil-users] /info/ versus /ci?name=

2014-07-10 Thread Stephan Beal
Re name=... Vs /name... Historical - initially for the wiki api, but happens at the lowest level of args handling, so all pages except the json api inherit it. - stephan Sent from a mobile device, possibly from bed. Please excuse brevity and typos. On Jul 10, 2014 5:42 AM, Andy Goth

Re: [fossil-users] [fossil extras] versus symlinks

2014-07-10 Thread Matt Welland
What is allow-symlinks set to for you? From context it sounds like it is set to yes. If so this is *terrible* behavior and a bad bug. If it is set to 0 (IMHO an awful option that is default and should not even exist [i] ) then I think what you are seeing is the expected behavior. [i] In my

[fossil-users] Forks are fun.

2014-07-10 Thread Matt Welland
I'd like to make life a little easier for the people using fossil here. There are some behavioral changes that can be made (do more work on branches for example) but it would be nice if this could be improved. Three unintentional forks here caused some unnecessary ugliness on the timeline.

Re: [fossil-users] [fossil extras] versus symlinks

2014-07-10 Thread Andy Goth
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Thu, Jul 10, 2014 at 9:52 AM, Matt Welland estifo...@gmail.com wrote: What is allow-symlinks set to for you? From context it sounds like it is set to yes. If so this is *terrible* behavior and a bad bug. If it is set to 0 (IMHO an awful option

Re: [fossil-users] [fossil extras] versus symlinks

2014-07-10 Thread Matt Welland
On Thu, Jul 10, 2014 at 11:38 AM, Andy Goth andrew.m.g...@gmail.com wrote: It is versionable, Ha! I can't believe I didn't think of taking advantage of this! I'll have to look at how to build creating the .fossil-settings dir + appropriate files into the fsl wrapper on creation of a new

Re: [fossil-users] Unusual timeline

2014-07-10 Thread Stephan Beal
On Thu, Jul 10, 2014 at 7:12 PM, Matt Welland estifo...@gmail.com wrote: I find that forks are surprisingly disconcerting to casual users of fossil. A common scenario is that a fork occurs and then developers spin their wheels in silly I already committed this! But I did and update and I

Re: [fossil-users] [fossil extras] versus symlinks

2014-07-10 Thread Stephan Beal
On Thu, Jul 10, 2014 at 8:57 PM, Matt Welland estifo...@gmail.com wrote: Ha! I can't believe I didn't think of taking advantage of this! I'll have to look at how to build creating the .fossil-settings dir + appropriate files into the fsl wrapper on creation of a new fossil. That actually

[fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Andy Goth
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 At work we use ClearCase version tree merge arrows to visually indicate what Fossil calls cherrypick and backout merges. For a cherrypick merge, we draw a merge arrow from the contributor version(s) to the new version. For a backout merge, we tend

[fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Andy Goth
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 7/10/2014 2:37 PM, Andy Bradford wrote: Thus said Andy Goth on Thu, 10 Jul 2014 14:27:57 -0500: I want to see something in the timeline plot showing cherrypicks and backouts. Dotted, dashed, and/or colored lines might do the job. I also

[fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Andy Goth
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 7/10/2014 3:14 PM, Andy Goth wrote: I'm putting together a mockup screenshot illustrating a few ideas and motivating this feature, but it's not ready yet. Can I send it to this list as an attachment, or do I have to host it somewhere and link

Re: [fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Andy Bradford
Thus said Andy Goth on Thu, 10 Jul 2014 15:14:07 -0500: Not all cherrypicks and backouts are done by [fossil merge]. Around here, lots of things are done by hand. I see what you mean. You're looking for a way to tag something as ``merged'' by copy-paste and not using merge

Re: [fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Stephan Beal
On Thu, Jul 10, 2014 at 11:01 PM, Andy Bradford amb-fos...@bradfords.org wrote: I see, I think I've misunderstood your proposal. You aren't suggesting that the Q-card stored in the manifest be changed, but that it be allowed to be superceded by another manifest that has

[fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Andy Goth
. Not sure if my image attachment made it to the list, but here's a link to the mailing list archive which may work too: http://lists.fossil-scm.org:8080/pipermail/fossil-users/attachments/20140710/35580a49/attachment-0001.png The image doesn't show any examples of backouts, but I imagine they could

Re: [fossil-users] Visual indication of cherrypick and backout merges

2014-07-10 Thread Andy Bradford
Thus said Stephan Beal on Fri, 11 Jul 2014 00:22:52 +0200: If that summary indeed reflects the goal, i _think_ it's just a matter of changing the timeline query to do so. Looking at the code now, i see that graph.c is quite a bit more than a timeline parser, though, so maybe it's not as

Re: [fossil-users] [fossil extras] versus symlinks

2014-07-10 Thread Timothy Beyer
At Thu, 10 Jul 2014 17:54:49 +0200, Stephan Beal wrote: i apologize if i gave that impression. i was refering to re-thinking in terms of fixing, as opposed to removing. i would not, in fact, mind if symlink support was dumped (i have always felt it falls outside of fossil's core, but i also

Re: [fossil-users] [fossil extras] versus symlinks

2014-07-10 Thread Timothy Beyer
At Thu, 10 Jul 2014 09:52:13 -0700, Matt Welland wrote: [1 multipart/alternative (7bit)] [1.1 text/plain; UTF-8 (7bit)] [1.2 text/html; UTF-8 (quoted-printable)] What is allow-symlinks set to for you? From context it sounds like it is set to yes. If so this is *terrible* behavior and

Re: [fossil-users] [fossil extras] versus symlinks

2014-07-10 Thread B Harder
It's clear people are split on what The Right Thing To Do is re: symliks. I'm personally not sure; I don't use them in the course of development. That said, I feel like they should *not* be in indirrected-through as a matter of treatment. It's understandable those that _would_ like them to be

Re: [fossil-users] [fossil extras] versus symlinks

2014-07-10 Thread Timothy Beyer
At Thu, 10 Jul 2014 20:10:09 -0700, B Harder wrote: It's clear people are split on what The Right Thing To Do is re: symliks. I'm personally not sure; I don't use them in the course of development. That said, I feel like they should *not* be in indirrected-through as a matter of

Re: [fossil-users] [fossil extras] versus symlinks

2014-07-10 Thread Timothy Beyer
At Thu, 10 Jul 2014 21:31:11 -0700, B Harder wrote: It's certainly not cut and dried :) This has been a fairly thought provoking discussion, as in the process of arguing for symlinks, I'm now questioning why I like them so much for backups (I never use them for any of my development