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