Re: [translations] Catalan translation

[Walter Garcia-Fontes <walter.garcia@xxxxxxx>]

* Federico Bruni, fede@xxxxxxxxxxxxx [17/12/17 08:54]:
> 1. you did not commit the changes which fixed the errors
> 2. or you committed the fixes without using the --amend option, so
> two patch files are generated and you shared only the first patch
> (not the second containing the fixes)
> 
> (but you should use `git commit --amend` and send a single patch file)

Thanks Federico, 

I think there is another thing I'm doing wrong. Let me explain my
steps and see if we can figure where I'm screwing up.

Once I compile in my branch and I'm sure the compilation finishes
without any errors and I revise the logs and I only see the snippets
and repeated nodes warnings, I do the following. I commit my changes,
I checkout the translation branch and "git pull" to make sure it is up
to date. It was for this patch. I went back to my branch, and I
issued:

git format-patch origin

These created to my surprise:

0001-Doc-ja-update-LM.patch
0002-Bump-version-to-2.19.80-for-stable-prereleases.patch
0003-Doc-ca-Catalan-translation-of-the-notation-manual-ex.patch
0004-Web-Add-a-new-document-to-what-We-Wrote-list.patch
0005-Doc-es-update-Notation-Simultaneous.patch
0006-Web-es-update-Introduction.patch
0007-Doc-es-update-one-texidoc.patch
0008-Doc-ja-update-Usage.patch
0009-Doc-ja-fix-cindex-in-NR.patch
0010-Fix-issue-5110-Don-t-use-fixed-color-for-LyricHyphen.patch
0011-Doc-typo-in-Changes-and-Notation-Text.patch
0012-Doc-fr-updates-NR-and-Changes.patch
0013-Doc-it-update.patch
0014-Doc-run-translation-update.patch
0015-Reorganize-entries-for-2.20-release.patch
0016-Doc-ja-update-NR-Musical-notation.patch
0017-Doc-ja-update-NR-partially-to-fix-compilation-errors.patch
0018-More-improvements-to-Changes.tely-items.patch
0019-Doc-it-fix-wrong-italian-sentence.patch
0020-Changes.tely-fix-whitespace-and-semi-colons.patch
0021-Issue-5171-Self_alignment_interface-aligned_on_self-.patch
0022-Issue-5175-Update-URW-OTF-files.patch
0023-Issue-5137-1-Doc-Add-how-to-change-the-notation-font.patch
0024-Issue-5137-2-Doc-Add-how-to-use-set-global-fonts-for.patch
0025-Register-Merge_rests_engraver.patch
0026-Doc-Add-section-on-SVG-to-Contributor.patch
0027-Issue-5195-Don-t-segfault-on-c-1.patch
0028-Standardize-format-of-in_color.patch
0029-Issue-5191-EG-a-bit-of-grob-transformer-documentatio.patch
0030-Typo.patch
0031-Issue-5197-Include-direction-marker-in-post-event-lo.patch
0032-Issue-5180-Require-version-statement-in-main-file.patch
0033-Define-ly-music-error.patch
0034-Issue-5203-Don-t-let-event-chord-reduce-bomb-on-empt.patch
0035-Issue-5200-display-lily-tests.ly-Remove-unused-lily-.patch
0036-Issue-5205-chordmode-c-sus-should-be-c-f-g-not-c-g-g.patch
0037-Issue-5204-Remove-white-space-from-storePredefinedDi.patch
0038-Issue-5206-Remove-apostroph-in-backend-options-of-ge.patch
0039-Pitches.itely-Typo-Harmonia-Sacra-not-Harmonica-Sacr.patch
0040-Doc-fr-updates-changes-and-NR.patch
0041-Release-bump-VERSION_DEVEL.patch
0042-PO-update-template.patch
0043-Release-update-news.patch
0044-Release-bump-Welcome-versions.patch
0045-PO-fetch-es-fr-it-and-ja-from-FTP.patch
0046-Doc-es-update-all-except-Changes-which-is-too-hard-f.patch
0047-Doc-es-mark-Changes-as-up-to-date-until-it-is-actual.patch
0048-PO-fetch-Dutch-from-FTP.patch
0049-Changes.tely-Typo-fix-TexInfo-markup.patch
0050-Doc-ja-update-NR-Spcialist-notation.patch
0051-Doc-ja-minor-changes-relevant-to-terms-of-ancient-no.patch
0052-Doc-ja-fix-some-compilation-errors.patch
0053-Doc-fr-fix-commit-IDs.patch
0054-Doc-ca-Translation-of-vocal-of-Notation-manual.patch

Then I submitted 0054, which is what I think Jean-Claude tried to
apply. But up there I see also a previous patch of mine which was
already merged some months ago.

How come I'm getting all these patches? Just to make sure, I saved all 
the files changed in my last round of changes, 
cloned a new git repository, created a new 
personal branch, merged all the saved changes,
created a clean compilation, made sure my branch 
was up to date, created the patches, and again,
I'm getting all these old patches. 

I think that is the problem I'm having, somehow all
these previous patches are not applied in my repository,
even if I start from scratch.

Thanks again and sorry for the fuzz, 

Walter





-- 
Walter Garcia-Fontes
L'Hospitalet de Llobregat