Re: [translations] lost committishes [WAS Re: Doc-it: revision of snippets in LM (please backport to 2.14)]

[Francisco Vila <paconet.org@xxxxxxxxx>]

2011/7/22 Federico Bruni <fedelogy@xxxxxxxxx>:
> Il giorno mer, 20/07/2011 alle 00.41 +0200, Federico Bruni ha scritto:
>> I've added the corrections of the proofreader and fixed the committish
>> of .texidoc files (which was a fatal bad object, probably because of
>> the
>> troubles we had in applying the previous patch).
>
> I think I was wrong here, because it's happened again.
> The problem is that Francisco has probably changed some mistake in my
> patch and then committed with a new commit. At least this is my guess,
> because after pulling I have double commits plus a merge:

Did you pull with your own changes applied?  You should pull onto a
version that is previous to your changes, otherwise double commits are
expected.

> commit f42b010530f58c3817f4d4a985d76b2181b1f1df
> Merge: e11d8e7 c3b519f
> Author: Federico Bruni <fedelogy@xxxxxxxxx>
> Date:   Fri Jul 22 17:41:37 2011 +0200
>
>    Merge branch 'lilypond/translation' of git://git.sv.gnu.org/lilypond
> into lilypond/translation
>
> commit c3b519f0dd5ff0f8ccfc9a39ed1fe8df8b43741c
> Author: Federico Bruni <fedelogy@xxxxxxxxx>
> Date:   Wed Jul 20 00:17:06 2011 +0200
>
>    Doc-it: fix translations in snippets. Run makelsr.
>
> commit 4726227b76f1016098c10d0b20ef2062f931c26b
> Author: Federico Bruni <fedelogy@xxxxxxxxx>
> Date:   Wed Jul 20 00:25:44 2011 +0200
>
>    Doc-it: fix translation of snippets in LM
>
> commit e11d8e736858097eb4e400bfdb7f7593db25de1f
> Author: Federico Bruni <fedelogy@xxxxxxxxx>
> Date:   Wed Jul 20 00:25:44 2011 +0200
>
>    Doc-it: fix translation of snippets in LM
>
> commit 514674cb00c18629242dfcde0c1a4976758adc56
> Author: Federico Bruni <fedelogy@xxxxxxxxx>
> Date:   Wed Jul 20 00:17:06 2011 +0200
>
>    Doc-it: fix translations in snippets. Run makelsr.
>
> commit d961c10edbe32c4b82e348fc40bc239a37eb1428
> Author: Francisco Vila <francisco.vila@xxxxxxxxxxxxx>
> Date:   Thu Jul 14 12:34:40 2011 +0200

Firstly, get sure what branch are you in, then git log, then compare
this with one of

  http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=shortlog;h=refs/heads/master
  http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=shortlog;h=refs/heads/lilypond/translation
  http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=shortlog;h=refs/heads/stable/2.14

> This is my usual Git FAQ (Francisco knows it well :)).
> Usually I can reset hard to a previous commit, pull again and forget
> about anything.
> But in this case I can't keep in my .texidoc files committishes that are
> not recorded in Git, otherwise I won't be able to track the changes and
> update translations accordingly.
>
> In a nutshell: the committish of my .texidoc files is a fatal bad object
> for Git.

Not for git, but rather for our lilypond scripts. Git does not
complain about a number in a file.

If I understand well, you want to know what is the correct committish
for a texidoc so that you can track the changes later.  First, this is
not possible between different branches: you stick in a branch. Mixing
branches does not allow you to track changes on a file because version
IDs for similar patches are very different in general.

Given a file and a branch, you should always know the very last change
to that file. This is shown at the first line of 'git log <file>'.
Put that one on your translation and it will be marked as up to date.

If you are in doubt, go to gitweb in savannah and take version IDs
from there as the only correct ones; if your commit IDs are different
from those, and you put them in your translations anyway, for sure you
are going to obtain 'bad object' fatal errors.

Please ask more if you need it.
-- 
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com