Git merges for compressed xml files

Options
goofy78270
goofy78270 Posts: 133 ✭

We are looking to try and implement git support within parasoft, but given that tst files are typically compressed xmls, due to their size, we are curious if the push/pulls address the compressing to account for the diff between files or if the update is an overwrite?

Git setup for parasoft - https://docs.parasoft.com/display/SVC20201/Connecting+to+Your+Source+Control+Repository

According to this post as well as a few others, git does not really have a support mechanism for compressed files and xml seems to be problemmatic.
https://stackoverflow.com/questions/44229558/decompressing-a-file-before-merging-versions-in-git

Comments

  • Matt Love
    Matt Love Posts: 107 admin
    Options

    We typically save the .tst files as UNcompressed XML for Git. See Parasoft > Preferences > Misc in SOAtest. That way even though the file size is larger each change is stored as an incremental diff in Git instead of another whole binary file for overwrite.

  • jakubiak
    jakubiak Posts: 833 admin
    Options

    While it is possible to save .tst files as uncompressed XML, Parasoft does not recommend using source control to merge changes from multiple users. Doing so has a high risk that the merged XML will be a malformed .tst file, which may lose information or not be usable. You can use the uncompressed XML format to save space in your Git repository as @Matt Love mentioned, but merging multiple changes through Git is not recommended.