Menu

#826 Using team project needs all team in the same OS

None
closed-out-of-date
nobody
CR/LF (2) EOL (2)
5
2016-07-02
2016-06-30
Teseu
No

If you use a team project, in github for instance, and the team members have different OS (Windows, Linux, Mac), every commit (or push, in git) submited, when downloaded erases all work done previously by the user that is downloading, if in other OS.

When the file project_save.tmx is uploaded (you can't choose the EOL type and this is the main cause of the problem) and compared to the trunk, if the EOL is different, as LF to CR LF, the file is 'new' and replace the 'older'. There's no merge, and all translations are lost.

I believe this is an improvment that will help any team with different backgrounds. It's not a bug, just a new feature.

Discussion

  • Aaron Madlon-Kay

    • labels: CR/LF, EOF --> CR/LF, EOL
    • status: open --> closed-out-of-date
     
  • Aaron Madlon-Kay

    EOL handling has changed in 4.0. If it's still an issue in 4.0 then you can open a new ticket.

    In the meantime, the solution is to correctly set EOL handling in your VCS. For svn that means setting the property svn:eol-style to native; for git see text=auto.

     
  • Aaron Madlon-Kay

    There's no merge, and all translations are lost.

    This should not be the case. A naive diff may show the entire file being replaced, but no translations should be lost. If you can reproduce this effect please provide specific instructions, or provide a git repo with a commit that fits your description.

     
    • Teseu

      Teseu - 2016-07-02

      The project in question is LibreOffice and the image attached shows just one commit with almost everything deleted and inserted. I agree that any diff could show this and prevented any deletion, but using just the OmegaT interface, this is not the case. I added another image with a tipical commit, but the next commit, the same person, instead of everything deleted and inserted, a number very low.

       

      Last edit: Teseu 2016-07-02
  • Aaron Madlon-Kay

    • summary: Using team project needs all team in the same SO --> Using team project needs all team in the same OS
     
  • Aaron Madlon-Kay

    I ran git diff --ignore-space-at-eol d2daf -- pt-BR/LOGuides/omegat/project_save.tmx on your repo and obtained the attached diff. There is no data loss. Fix your EOL settings and the issue will go away.

     

Log in to post a comment.

MongoDB Logo MongoDB