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

Changeset ancestry is wrong when commit touches root path and creates branch/tag

    XMLWordPrintable

Details

    Description

      Problem

      Commit log:

      -----------------------------------------------------------------------
      r6 | glewandowski | 2015-10-27 14:04:03 +0100 (Tue, 27 Oct 2015) | 1 line
      Changed paths:
         A /proj1/branches
         A /proj1/branches/branch-1 (from /proj1/trunk:1)
         A /proj1/branches/branch-1/file_inproj1_trunk (from /proj1/trunk/file_inproj1_trunk:5)
      
      added branch-1 and branches in proj1
      

      SVN rules:

        <repository name="aaa" description="" store-diff="true" enabled="true"><svn url="file:///Users/glewandowski/repos/svn/wrong-ancestry" path="" follow-base="false" initial-import="none">
      <symbolic auto-rules="true"><trunk regex="([^/]+)/trunk(/|$)" name="trunk" logical="${1}"/><branch regex="([^/]+)/branches/([^/]+)" name="${1}-${2}" logical="${1}"/><tag regex="([^/]+)/t
      ags/([^/]+)" name="${1}-${2}" logical="${1}"/></symbolic></svn>
            <linker/><security use-defaults="true" allow-anon="false" allow-logged-in="false"><required-groups/></security>
      </repository>
      

      Ancestry for this commit is invalid and marked as like in screenshot

      This does matter for CommonnChangesetDAO#getChangeSetAncestors and for Branch Review plugin which traverse the ancestry tree to find commits made on given branch.

      Expected result:

      • The only parent for commit 6 is commit 5 OR/AND
      • CommonnChangesetDAO#getChangeSetAncestors skips changesets made on root path

      I added svn dump I have used for testing

      Attachments

        1. screenshot-2.png
          screenshot-2.png
          73 kB
        2. wrong-ancestry.dump
          3 kB

        Issue Links

          Activity

            People

              Unassigned Unassigned
              glewandowski Grzegorz Lewandowski
              Votes:
              1 Vote for this issue
              Watchers:
              6 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: