Re: Conflict issues with WebLate translations for libosinfo projects

On Thu, Jan 16, 2020 at 01:17:18PM +0100, Jean-Baptiste Holcroft wrote:
> Hi,
> 
> Le 2020-01-16 12:52, Fabiano Fidêncio a écrit :
> > Firstly, we're receiving MRs on our GitLab directly changing po/*po
> > files. is that expected?
> 
> Yes, your component uses the plugin "Update PO files to match POT
> (msgmerge)"
> https://docs.weblate.org/en/weblate-3.10.1/admin/addons.html#update-po-files-to-match-pot-msgmerge
> 
> This will update automatically all po files, allowing translators to see
> missing translations without having you to care about updating all files.
> 
> > If so, what would be the best way to:
> > 1) Avoid things like
> > https://translate.stg.fedoraproject.org/projects/libosinfo/libosinfo/#alerts?
> 
> Here you have the Polish file in conflicts. It probably means it was edited
> in both git repositories.

I don't believe that's the case here if I look at the git commit history

In the main upstream libosinfo.git repo we have this commit:

commit 3d6422ced93c3f7797300bd8476a5ca9ab492217
Author:     Piotr Drąg <[email protected]>
AuthorDate: Sat Jan 11 11:03:47 2020 +0000
Commit:     Fabiano Fidêncio <[email protected]>
CommitDate: Mon Jan 13 08:22:15 2020 +0100

    Translated using Weblate (Polish)
    
    Currently translated at 100.0% (168 of 168 strings)
    
    Translation: libosinfo/libosinfo
    Translate-URL: https://translate.stg.fedoraproject.org/projects/libosinfo/libosinfo/pl/
    
    Signed-off-by: Piotr Drąg <[email protected]>

This was from a Weblate merge request merged on Monday:

  https://gitlab.com/libosinfo/libosinfo/merge_requests/43

If we look at the Weblate git repo though, the commit was
updated by the translator again on Wednesday, *after* the
weblate merge request was already accepted:

  commit 17e6dde789283689a36dafe2bd9c453d671b6ec3
  Author: Piotr Drąg <[email protected]>
  Date:   Wed Jan 15 15:25:28 2020 +0000

    Translated using Weblate (Polish)
    
    Currently translated at 100.0% (168 of 168 strings)
    
    Translation: libosinfo/libosinfo
    Translate-URL: https://translate.stg.fedoraproject.org/projects/libosinfo/libosinfo/pl/
    
    Signed-off-by: Piotr Drąg <[email protected]>

So AFAICT, the cause of the conflict is weblate itself.

It should never have amended the existing commit because it
had already been accepted via the merge request 2 days earlier.

For some reason weblate did not see that the merge request was
accepted and so did not refresh its view of the upstream repo,
allowing the translator to continue working on outdated content
ultimately resulting in this conflict.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
_______________________________________________
trans mailing list -- [email protected]
To unsubscribe send an email to [email protected]
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/[email protected]