Uploaded image for project: 'Qt Creator'
  1. Qt Creator
  2. QTCREATORBUG-10099

Incorrect display of three-way-diff

    XMLWordPrintable

Details

    • Bug
    • Resolution: Done
    • P2: Important
    • Qt Creator 3.2.0
    • Qt Creator 2.8.1, Qt Creator 3.0.0-rc1, Qt Creator 3.2.0
    • None
    • Windows 7 64 bit
      git version 1.8.1.msysgit.1
    • ceedde87694068bd1d4f97deaaf0d7cca6fa0780

    Description

      1. Create a three way diff in a git repository, e.g. by trying to merge with a conflict.
        1. Create two new branches at the same revision.
          Let's call them A and B.
        2. Checkout branch A.
        3. Open a file from the repository.
        4. Change one line in this file.
        5. Commit the change.
        6. Checkout branch B.
        7. Open the same file as in step 1.3.
        8. Change something different, but in the same line as in step 1.4.
        9. Commit the change.
        10. Merge branch A by typing "git merge A" on the command line.
          Git will notice the merge conflicts. Don't resolve them, everything is ready now.
      2. In "Tools" -> "Options..." -> "Version Control" -> "Git", enable "Show diff side-by-side".
      3. Make Creator show this diff.
        It will show something which is not helpful at all:

        Keep in mind that the file can be huge. Finding the relevant lines like this can really be a pain in the back.

      Instead, Creator could show the unchanged lines on both sides next to each other. The lines which have been changed from the parent revision of the checked out branch, i.e. everything between "<<<<" and ">>>>" could be shown and hightlighted in the right window.
      Or Creator could even show three windows side by side, displaying all relevant versions of the file.

      Attachments

        1. 3diff.png
          3diff.png
          119 kB
        2. mergeconflict.png
          mergeconflict.png
          65 kB

        Issue Links

          For Gerrit Dashboard: QTCREATORBUG-10099
          # Subject Branch Project Status CR V

          Activity

            People

              jkobus Jarek Kobus
              rlohning Robert Löhning
              Votes:
              1 Vote for this issue
              Watchers:
              7 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Gerrit Reviews

                  There are no open Gerrit changes