Re: Choosing branches

On 3 April 2016 at 19:05, Misha Shnurapet <misha@gnome.org> wrote:

Makes perfect sense. Be the process automated, it would save us all so
much time.

We discussed this topic in meeting. Alex provided information as following.
<aeng> if master is already there and you wish to merge in translation from f24 branch, then use "merge translations" feature, that will bring all matching and approved/translated across.

As i thought earlier there is automated process for this.

-

Pravin Satpute

 

Misha
https://fedoraproject.org/wiki/User:Shnurapet
English / Español / Italiano / Русский

On Sat, Apr 2, 2016 at 4:30 PM, Richard E. van der Luit
<nippur@fedoraproject.org> wrote:
> tiansworld schreef op vr 01-04-2016 om 22:44 [+0800]:
>>
>>
>> On Fri, Apr 1, 2016 at 2:41 AM, Misha Shnurapet <misha@gnome.org>
>> wrote:
>> > Hello.
>> >
>> > It's not clear how the branches are related throughout multiple
>> > release cycles.
>> >
>> > Fixing a translation error, do I have to edit all the branches I
>> > can
>> > find? What is master branch for? How is it related f24-branch?
>> > Where
>> > do I put fixes? Are rhel*-branches to be translated?
>> >
>> >
>> Hi Misha,
>> Here is my experiences on branch and translation bugs fixing. Hope it
>> can help you.
>> Master is the main branch, which will continue to update, and be
>> branched to other branches if needed during developing process.
>> f24-branch is the branch used only for upcoming release Fedora 24.
>> rhel branches are used for RHEL releases.
>>
>> If you need to fix a bug, first is to know where is it from, for
>> example the release number, Fedora 24.
>> Then you may go to the correct branch, i.e. f24-branch and make your
>> fixes. If the bug exist in master too, you should fix it again in
>> master. So it won't affect any future branches.
>>
>> --
>> Regards,
>>
>> Tian Shixiong
>> Fedora Project Contributor
>> --
>> trans mailing list
>> trans@lists.fedoraproject.org
>> http://lists.fedoraproject.org/admin/lists/trans@lists.fedoraproject.
>> org
>
> Leaves the question why as a default the current branch isn't updated
> out of the master once in a while. IMHO we only should update the
> master, and leave the updating of other branches to the project
> managers of those branches.
> I spend too much time in correcting the same strings in all flavors
>  (master, F24, RHEL x to zillion).
> --
> trans mailing list
> trans@lists.fedoraproject.org
> http://lists.fedoraproject.org/admin/lists/trans@lists.fedoraproject.org
--
trans mailing list
trans@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/trans@lists.fedoraproject.org