From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Menzel Subject: Re: use case: keep the output of a markup (TeX) file under revision control Date: Thu, 17 Feb 2011 20:51:59 +0100 Message-ID: <1297972319.3944.30.camel@mattotaupa> References: <1297939020.3959.12.camel@mattotaupa> <4D5D0EA2.4000805@atlas-elektronik.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-HeFLPNqY2m0MgVUBeLwB" Cc: "git@vger.kernel.org" To: Stefan Naewe X-From: git-owner@vger.kernel.org Thu Feb 17 20:52:12 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Pq9tb-0006bE-5m for gcvg-git-2@lo.gmane.org; Thu, 17 Feb 2011 20:52:11 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756689Ab1BQTwF (ORCPT ); Thu, 17 Feb 2011 14:52:05 -0500 Received: from mail.gw90.de ([188.40.100.199]:40093 "EHLO mail.gw90.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753541Ab1BQTwE (ORCPT ); Thu, 17 Feb 2011 14:52:04 -0500 Received: from f053032084.adsl.alicedsl.de ([78.53.32.84] helo=[192.168.178.21]) by mail.gw90.de with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Pq9tQ-0007gY-Cl; Thu, 17 Feb 2011 19:52:00 +0000 In-Reply-To: <4D5D0EA2.4000805@atlas-elektronik.com> X-Mailer: Evolution 2.30.3 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: --=-HeFLPNqY2m0MgVUBeLwB Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Am Donnerstag, den 17.02.2011, 13:03 +0100 schrieb Stefan Naewe: > On 2/17/2011 11:37 AM, Paul Menzel wrote: > > (Please CC me when replying since I am not subscribed.) > >=20 > > I have the following use case and need an advise from you professionals= . > >=20 > > A friend and I are writing a paper using TeX=C2=B9 and keep the files u= nder > > revision control using Git. This works fine so far. But I want to also > > have the output (PDF) of the markup file under revision control to be > > able to access the PDF files even if for example no TeX installation is > > available on a system. > >=20 > > The problem now is, since the output is no plain text file, that > > merging/rebasing always shows conflicts which Git, of course, cannot > > solve. > >=20 > > Is there a way to set that up so that there are no conflicts? Would a > > pre-commit hook work which generates the PDF file prior to committing? > > And if no TeX installation is available it would just ignore the PDF > > files? > >=20 > > I could not find anything on the Web because having PDF as search strin= g > > would just show up how to generate documentation about Git. >=20 > Why don't you keep the PDF files in a separate branch ? Look at git's > git repository (http://git.kernel.org/?p=3Dgit/git.git) in the html=20 > and man branches. Very interesting. Thank you very much for this hint. Is the used solution in git=E2=80=99s git repository a result of the proble= m with maintaining generated output from source files or does it have other other advantages too? When creating TeX documents =E2=80=93 at least in my work flow =E2=80=93 I = always have the PDF file open in parallel. Would that be a problem when having it in a separate branch? Also I guess that this is done automatically too (saying autogenerated in `git log origin/man`). I could not find the script though. $ git grep Autogen git-gui/Makefile: echo '# Autogenerated by git-gui Makefile'= >$@ && \ git-gui/git-gui.sh:if {[gets $fd] eq {# Autogenerated by git-gui Ma= kefile}} { and searching for =C2=BBgit "Autogenerated manpages for"=C2=AB did not retu= rn anything useful for me. Additionally I am confused where the SHA id g43f9f in =C2=BBAutogenerated manpages for v1.7.4.1-42-g43f9f=C2=AB comes from. I could not find that commit in `origin/master` or `git log v1.7.4.1`. The last thing is that in git=E2=80=99s git repository the autogeneration o= f the manual pages does not seem to happen every commit (Is it a cron job?). In my use case the PDF file should be generated after every commit. Is a separate branch the way to go here? Thanks, Paul --=-HeFLPNqY2m0MgVUBeLwB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEABECAAYFAk1dfF8ACgkQPX1aK2wOHVi7BgCfYpMTREH6PFiVkN4k0+pomTFD LBQAn3AAV+f3PyN9DE0Twtd6gnMEiYSH =rmDX -----END PGP SIGNATURE----- --=-HeFLPNqY2m0MgVUBeLwB--