Uploaded image for project: 'FishEye'
  1. FishEye
  2. FE-4336

Fisheye should be aware of svn keywords, specifically when anchoring patches

    XMLWordPrintable

Details

    Description

      SVN supports a feature which allows for keywords such as $Id$ or $Rev$ to be placed in a file, which are then expanded when that file is checked out.

      Fisheye is not aware of this feature - it will check and index versions of the file that have the keywords expanded. This is a problem for SVN when creating a pre-commit review if any of the affected lines are included in the patch because Fisheye will see the original file looking something like this:

      /* $Id: main.c 123456 2012-01-01 01:00:00Z rstephens $ */
      

      But when SVN generates the diff, it doesn't expand the keyword before generating it - it will look something like this:

      -/* $Id$ */
      

      So if the line containing the ID has been modified or is near a line that has been modified, fisheye will fail to anchor the patch.

      Attachments

        1. patch-seen-in-crucible.png
          patch-seen-in-crucible.png
          30 kB
        2. patch-from-svn-diff.png
          patch-from-svn-diff.png
          28 kB
        3. patch-anchor-keywords.tar.gz
          19 kB
        4. anchor-patch-with-the-fix.png
          anchor-patch-with-the-fix.png
          55 kB

        Issue Links

          Activity

            People

              mparfianowicz Marek Parfianowicz
              rstephens Richard Stephens (Inactive)
              Votes:
              15 Vote for this issue
              Watchers:
              23 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Time Tracking

                  Estimated:
                  Original Estimate - Not Specified
                  Not Specified
                  Remaining:
                  Remaining Estimate - Not Specified
                  Not Specified
                  Logged:
                  Time Spent - 34m
                  34m