Uploaded image for project: 'Qt Design Studio'
  1. Qt Design Studio
  2. QDS-13663

QDS breaks project from being git-friendly

    XMLWordPrintable

Details

    • Bug
    • Resolution: Unresolved
    • P2: Important
    • QDS 4.8
    • QDS 4.5
    • Project Storage
    • None

    Description

      When QDS opens a project it updates the <project>.qmlproject.qtds file. This file is stored in git by default. Even if nothing is changed in the project the file is updated and this prevents smooth flow with Git. 

      Idea of the Git is to work as version control but also as a way to share projects between different team members.

      Even if anything is updated on the project, QDS writes the Environment ID into the git and when another user does 'git pull' this obvisously fails.

       

      Steps to reproduce

      1. Open QDS project with user A
      2. Save project
      3. Push to git
      4. Pull the project with user B from git 

      Expected result:

      • Git pull goes smoothly through.

       

      Actual result:

      • Git pull fails and there is a merge conflict. Open the conflicting file and there is change in the <project>.qmlproject.qtds file like this

      <<<<<<< HEAD
      <!-- Written by QtDesignStudio 4.6.0, 2024-09-05T10:30:25. -->
      <qtcreator>
      <data>
      <variable>EnvironmentId</variable>
      <valuetype="QByteArray">{5ba5c7ff-a2a7-47fe-9117-eeb59a892943}</value>
      =======
      <!-- Written by QtDesignStudio 4.5.1, 2024-09-13T23:32:36. -->
      <qtcreator>
      <data>
      <variable>EnvironmentId</variable>
      <valuetype="QByteArray">{4e4eee19-c17d-426c-80c2-beeb111a418d}</value>
      >>>>>>> main
       

      This needs annoying 'git stash && git pull' as workaround.

       

       

       

      Attachments

        No reviews matched the request. Check your Options in the drop-down menu of this sections header.

        Activity

          People

            thohartm Thomas Hartmann
            javihria Jarko Vihriälä
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated:

              Gerrit Reviews

                There are no open Gerrit changes