| [translations] lost committishes [WAS Re: Doc-it: revision of snippets in LM (please backport to 2.14)] |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Translations list at lilynet <translations@xxxxxxxxxxx>
- Subject: [translations] lost committishes [WAS Re: Doc-it: revision of snippets in LM (please backport to 2.14)]
- From: Federico Bruni <fedelogy@xxxxxxxxx>
- Date: Fri, 22 Jul 2011 17:54:56 +0200
- Cc: Carl Sorensen <c_sorensen@xxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; bh=+3vx3312f+L5+pTV9D0UEU0ZiyIBiVab8z2DhXauT3k=; b=IQXhbRa5nuXuzNVGvqd1psS5wny9sjMvMgNUl/YbZ+rRp88oxhAsFj4GY3o5VXBdg6 GQj8iy6MA7gEsKbwFrcleSF5kBZvOReGiAcAvt2YzWTRUPLdYPEFElJzNm7LzEC1QA3n 7kQK5aVlduJro5oqzR+UmdniZJ6cdcL+f2QEQ=
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:
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
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.
How should we fix it?
Thanks,
Federico