Re: [fossil-users] Ignoring merge conflicts on a binary file
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 ​Adding *.pdf to the above list means what exactly in terms of repo storage? On Tue, Jul 28, 2015 at 6:50 PM, Christopher M. Fuhrman cfuhr...@pobox.com wrote: 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 ignored during merge conflicts. I know this violated the basics of a scm, but it is possible to tell the repository to treat some file differently and do not try to merge them, but simply replace? I believe doing this: $ fossil settings binary-glob *.pdf would work. Probably better to do it from the web ui in case there are other values present in that setting. Cheers! Your faithfully, Paolo ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Christopher M. Fuhrman cfuhr...@pobox.com ___ 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] Ignoring merge conflicts on a binary file
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 ignored during merge conflicts. I know this violated the basics of a scm, but it is possible to tell the repository to treat some file differently and do not try to merge them, but simply replace? I believe doing this: $ fossil settings binary-glob *.pdf would work. Probably better to do it from the web ui in case there are other values present in that setting. Cheers! Your faithfully, Paolo ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- Christopher M. Fuhrman cfuhr...@pobox.com ___ 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] Ignoring merge conflicts on a binary file
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 two documents: https://www.fossil-scm.org/index.html/doc/df302de88a4c54be7727/www/delta_format.wiki https://www.fossil-scm.org/index.html/doc/df302de88a4c54be7727/www/delta_encoder_algorithm.wiki Adding *.pdf to the above list means what exactly in terms of repo storage? I don't think it has any impact on storage. Andy -- TAI64 timestamp: 400055b81bf5 ___ 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] Ignoring merge conflicts on a binary file
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 languages all have a way to create a hyperlink to an external document. Why not upload the rendered PDF to a web server somewhere and link to it from those Fossil pages where you are currently contemplating offering a direct download from Fossil itself? If you are using Fossil to serve HTTP on your system, it is not difficult to set it up as a back-end server for a front-end proxy like nginx which serves static content, delegating dynamic content generation to Fossil. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Ignoring merge conflicts on a binary file
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 scm, but it is possible to tell the repository to treat some file differently and do not try to merge them, but simply replace? Your faithfully, Paolo ___ 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] Ignoring merge conflicts on a binary file
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: http://www.fossil-scm.org/index.html/artifact/49fd70d3136fbeb4794b7ef2f76c977c3ea77013?txt=1ln=762,766 So it looks like it tries to store the file as a delta, but only if it makes sense to do so. Andy -- TAI64 timestamp: 400055b83812 ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
