Re: [fossil-users] Ignoring merge conflicts on a binary file

2015-07-28 Thread sky5walk
The repo still grows and grows with every commit of a binary file. I don't fully understand this definition? binary-glob -- The VALUE is a comma or newline-separated list of (versionable) GLOB patterns that should be treated as binary files for committing and merging purposes. Example: *.jpg

Re: [fossil-users] fine(r) commit granularity

2015-07-28 Thread Paolo Bolzoni
fossil commit filename might help you in your problem? On Tue, Jul 28, 2015 at 5:32 PM, Gour g...@atmarama.net wrote: Hello, recently I was submtting some package-build scripts to one Linux distro and had to use Git - from within Emacs along with Magit interface. Somehow, the nad had arisen

Re: [fossil-users] Ignoring merge conflicts on a binary file

2015-07-28 Thread Christopher M. Fuhrman
Howdy, On Tue, 28 Jul 2015 at 3:43pm, Paolo Bolzoni wrote: Dear list, I am writing a pdf document using LaTeX, since some of the readers have problems compiling I'd like to keep also the .pdf under revision control. The .pdf is actually a binary output of other files, so it should be

Re: [fossil-users] Ignoring merge conflicts on a binary file

2015-07-28 Thread Andy Bradford
Thus said sky5w...@gmail.com on Tue, 28 Jul 2015 20:01:40 -0400: The repo still grows and grows with every commit of a binary file. I don't fully understand this definition? If I'm not mistaken, it doesn't store full copies of each commit, but instead uses the delta as described in these

Re: [fossil-users] Ignoring merge conflicts on a binary file

2015-07-28 Thread Warren Young
On Jul 28, 2015, at 4:43 PM, Paolo Bolzoni paolo.bolzoni.br...@gmail.com wrote: I am writing a pdf document using LaTeX, since some of the readers have problems compiling I'd like to keep also the .pdf under revision control. The Fossil wiki, ticket, tech note, and embedded Markdown

[fossil-users] Ignoring merge conflicts on a binary file

2015-07-28 Thread Paolo Bolzoni
Dear list, I am writing a pdf document using LaTeX, since some of the readers have problems compiling I'd like to keep also the .pdf under revision control. The .pdf is actually a binary output of other files, so it should be ignored during merge conflicts. I know this violated the basics of a

Re: [fossil-users] fine(r) commit granularity

2015-07-28 Thread Warren Young
On Jul 28, 2015, at 9:32 AM, Gour g...@atmarama.net wrote: split commit within one file in smaller chunks when one forgets to ’safe often, commit often’ or simply wants to divide single commit into several ones? Whenever I need to do that, I say “fossil diff x.patch”, revert the local

Re: [fossil-users] Ignoring merge conflicts on a binary file

2015-07-28 Thread Andy Bradford
Thus said Andy Bradford on 28 Jul 2015 18:18:26 -0600: If I'm not mistaken, it doesn't store full copies of each commit, but instead uses the delta as described in these two documents: And there is also this:

[fossil-users] check-in-edit branch ready?

2015-07-28 Thread Andy Bradford
Hello, I think the changes in the check-in-edit branch are ready for a broader audience and move to have it merged. Key changes in branch: Added new ``fossil amend'' command which has similar arguments found in ``fossil commit'' to allow altering tags on existing checkins from

Re: [fossil-users] branch from current branch

2015-07-28 Thread Andy Bradford
Thus said Stephan Beal on Tue, 28 Jul 2015 07:25:17 +0200: fwiw, in libfossil i've found that '.' is useful as an alias for the local checkout version (incl. local changes), which is normally different from the 'current' version. I thought ``current'' did refer to the local checkout

Re: [fossil-users] branch from current branch

2015-07-28 Thread Stephan Beal
On Tue, Jul 28, 2015 at 5:12 PM, Andy Bradford amb-fos...@bradfords.org wrote: Thus said Stephan Beal on Tue, 28 Jul 2015 07:25:17 +0200: fwiw, in libfossil i've found that '.' is useful as an alias for the local checkout version (incl. local changes), which is normally different

[fossil-users] fine(r) commit granularity

2015-07-28 Thread Gour
Hello, recently I was submtting some package-build scripts to one Linux distro and had to use Git - from within Emacs along with Magit interface. Somehow, the nad had arisen to use Magit’t ability to split diff into smaller chunks and do commit with fine(r) granularity which reminded me of the

Re: [fossil-users] fine(r) commit granularity

2015-07-28 Thread Steve Stefanovich
From: Paolo Bolzoni Sent: Wednesday, 29 July 2015 08:38 fossil commit filename might help you in your problem? It gets messy when there is a number of files, on Windows at least where using pipes and xargs is limited compared to Unix. On Tue, Jul 28, 2015 at 5:32 PM, Gour

[fossil-users] Elegant Image Manipulation In WIki

2015-07-28 Thread John Laurence Poole
I was looking for a way to manipulate binary images already saved within Fossil and have Scalable Vector Graphic (svg) overlays so I could annotate. I came across a Google project SVG-Edit and starting playing around with it. https://github.com/SVG-Edit/svgedit Using URLs to the raw image from

Re: [fossil-users] check-in-edit branch ready?

2015-07-28 Thread Joe Mistachkin
Andy Bradford wrote: I think the changes in the check-in-edit branch are ready for a broader audience and move to have it merged. It might be nice to have test coverage for the new command. Since the underlying [newly] shared code would end up being tested as well, it would be even more

[fossil-users] 3rd Call For Papers - 22nd Annual Tcl/Tk Conference (Tcl'2015)

2015-07-28 Thread andreask
Hello Fossil Users, fyi ... 22nd Annual Tcl/Tk Conference (Tcl'2015) http://www.tcl.tk/community/tcl2015/ October 19 - 23, 2015 Comfort Suites Manassas 7350 Williamson Blvd, 20109 Manassas, Virginia, USA [[ Attention! One month to the paper deadline ]] [[ Attention! Registration is open!