[fossil-users] Fwd: Updates to the fsl wrapper

2012-04-25 Thread Matt Welland
The following "features" have been added to the fsl wrapper script: 1. Autosync on tag. NB// Does not respect the autosync control in settings. 2. Conflicts are detected by grepping for a conflict signature and reported for "status" and "changes" 3. On commit if a conflict is detected the user i

Re: [fossil-users] Question about tags and autosync...

2012-04-25 Thread Michael L. Barrow
On 4/25/12 6:49 PM, Richard Hipp wrote: What command did you use to create the tag? fossil tag add foo current I don't see any code associated with the "tag" command that will do an autosync. My suspicious is that the documentation you site above is incorrect and that "tag creation" should

Re: [fossil-users] Question about tags and autosync...

2012-04-25 Thread Matt Welland
On Wed, Apr 25, 2012 at 6:49 PM, Richard Hipp wrote: > > > On Wed, Apr 25, 2012 at 6:51 PM, Michael L. Barrow wrote: > >> Firstly, I'm running: >>This is fossil version 1.21 [002580c50d] 2011-12-13 13:53:56 UTC >> >> Perhaps I'm confused, but the documentation for autosync being enabled >> sa

Re: [fossil-users] Question about tags and autosync...

2012-04-25 Thread Richard Hipp
On Wed, Apr 25, 2012 at 6:51 PM, Michael L. Barrow wrote: > Firstly, I'm running: >This is fossil version 1.21 [002580c50d] 2011-12-13 13:53:56 UTC > > Perhaps I'm confused, but the documentation for autosync being enabled > says: > > autosync If enabled, automatically pull prior to

Re: [fossil-users] How to list merged files after update

2012-04-25 Thread Matt Welland
On Fri, Apr 6, 2012 at 8:16 PM, Kriangkrai Soatthiyanont wrote: > It seems that `fossil changes` will show MERGED_WITH when you used > `fossil merge`, not when `fossil update` (to fix "would fork" error). > Anyway, after you have manually resolve conflicts, MERGED_WITH is > still shown, so it seem

Re: [fossil-users] Supporting markwon syntax for wiki

2012-04-25 Thread Ivan Vilata i Balaguer
chris (2012-04-22 17:09:45 +0200) wrote: > Please check out > > https://server.ac-drexler.de/fossil/fossil/doc/tip/addons/markdown.md > > for an integration proposal of the discount library with the build > system of fossil. > > ---

[fossil-users] Question about tags and autosync...

2012-04-25 Thread Michael L. Barrow
Firstly, I'm running: This is fossil version 1.21 [002580c50d] 2011-12-13 13:53:56 UTC Perhaps I'm confused, but the documentation for autosync being enabled says: autosync If enabled, automatically pull prior to commit or update and automatically push after co