| Re: [translations] Re: Catalan translation priority II |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: walter.garcia@xxxxxxx
- Subject: Re: [translations] Re: Catalan translation priority II
- From: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Wed, 30 Jul 2014 17:30:48 +0200
- Cc: Translations Lilypond <translations@xxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=obt7DSuElcrNrSTRiGFqHpw4/GefkvplzVfevq8M2Uc=; b=Kcn3QbrxgSBB3ws8GELA5S7TFYucAZhvQ5FVpc1vZ9uwM28ISd6/lJP1pBYncHg+/k nDVjoAJ4Rl0bWGRa3E8v++f6JPAlPIS6CSfFbTzVQtfskZhGJrxy8u9qPODiXPWMt61P 9OM727JhDDEwqAaB0nE3XCX7iHeMjWPqoNjXUEW5SaOO1kKMossp00P7qdOnDqHthVsI ZnChnHzuhNxFBgbLisUHNeV/fTJtV0ddCyrAgKiYJK1rwMccBdtXvO7cI3+RuUmqYEN0 tknMAtk4laeiXJmYoYqpnMu1Kkpl5Gq7Zcg7dxTMYq0Yx53VEByFjCf6U15j7chYi7Nj UI4Q==
2014-07-30 8:29 GMT+02:00 Walter Garcia-Fontes <walter.garcia@xxxxxxx>:
> * Federico Bruni, fedelogy@xxxxxxxxx [29/07/14 10:40]:
>> Try:
>> git format-patch origin/translation
>
> With that instruction still all the patches of master not in
> translation were created.
This means your current branch is master. It should be translation.
format-patch expects a range or a <since> commit, in which case the
upper limit of the range is assumed to be HEAD. What happens when
<since>..HEAD are in two different branches is that the range is taken
to be a huge branchful of commits, those that connect both HEADs.
> I think the problem is that the translation
> branch should be rebased against the master branch, but in that case
> my local branch could be rebased directly against master, right?
For sanity, I think you should forget master and concentrate in
translation for all. Very rarely you'll need master for anything about
translations unless you want to translate something still not there,
which in turn would bring new problems.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com