Uploaded image for project: 'Crucible'
  1. Crucible
  2. CRUC-8107

Diff in between branches not showing the right file/s

    XMLWordPrintable

Details

    • Bug
    • Resolution: Cannot Reproduce
    • Low
    • N/A
    • 4.4.1
    • None
    • None

    Description

      Problem Definition

      The file/s in the review are shown incorrectly when comparing by branch.

      Steps to reproduce

      1. Create empty GIT repository along with the following steps:
        1. git checkout -b blessed
        2. vim readme.txt (arbitrary content)
        3. git add readme.txt
        4. git commit -a
        5. git checkout -b feature1
        6. vim readme_feature1.txt (arbitrary content)
        7. git add readme_feature1.txt
        8. git commit -a
        9. git checkout blessed
        10. vim newfile (arbitrary content)
        11. git add newfile
        12. git commit -a
        13. cp newfile /tmp
        14. git checkout feature1
        15. cp /tmp/newfile .
        16. git add newfile
        17. git commit -a
      2. Add the repositoty in the Fisheye Crucible for review.
        1. Create a new review
        2. Choose branches > choose the repository > choose feature1 branch as the Branch to review and blessed branch as Branched from > click on Add branch > Start review.
      3. Back to the terminal in the local repository
        1. git merge blessed

      Result from local repository

      In the teminal:

      $ git diff blessed...feature1 --name-status
      A       readme_feature1.txt
      

      Result from Fisheye Crucible review

      Expected result from Fisheye Crucible review

      Show the readme_feature1.txt

      Attachments

        1. diff_branch.png
          diff_branch.png
          33 kB
        2. screenshot-1.png
          screenshot-1.png
          48 kB
        3. screenshot-2.png
          screenshot-2.png
          22 kB

        Activity

          People

            Unassigned Unassigned
            bannamalai Baskar Annamalai (Inactive)
            Votes:
            1 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: