VED file XML serialization PC vs MAC empty lines

  • #1, z mbdev87Tuesday, 04. April 2023, 23:25 hodinky A year ago
    Hello,

    I have an issue when saving game in editor on PC.
    The XML serializer removes empty lines from file generated on macOS, which results in about 25k modifications.

    I'm trying to check how this engine behaves in mixed PC/MAC environment with source control in place.

    All modifications in rooms are stored as XML which is fine to merge, but not when this occurs. 

     I _could_ ignore whitespaces, but that's not the point the file is modified *a lot* between versions and merging changes from 2+ people can be tricky.

    Bažant

    2 Posts


  • #2, z SimonSWednesday, 05. April 2023, 10:17 hodinky A year ago
    That's a problem with the \r\n line endings. The mac client needs to be set-up to use \r\n for single lines and not make two lines out of it. It's a problem I had with the source code as well.

    Kapitán

    1582 Posts

  • #3, z mbdev87Wednesday, 05. April 2023, 12:35 hodinky A year ago
    I thought for some reason that it will not properly recognize .ved files as text data. 
    But indeed setting this in macOS P4 workspace did the trick. 

    Thanks!

    Bažant

    2 Posts