Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-3010

svn log -g gives inconsistent merge info

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Duplicate
    • trunk
    • 1.5.1
    • unknown
    • None

    Description

      SVN r27021 from trunk. With the attached test repository, I have performed
      various merges from branches to other branches and finally back to the trunk and
      now get following revisions for "svn log -g svn://localhost":
      
      r36
      r35 result of merge from r36
      r34 result of merge from r36, r35
      r33 result of merge from r36, r35, r34
      r25 result of merge from r36, r35
      r35
      r34 result of merge from r35
      r33 result of merge from r35, r34
      r34
      r33 result of merge from r34
      r33
      r32
      ...
      
      What is inconsistent here it that r25 is reported as result of merge from r35
      (as part of r36 report), but it's not reported anymore for r35 itself. I'm not
      sure whether r25 should actually be reported because I have played with
      svn:mergeinfo at r35 and at r36, but I would anyway not expect this mixture.
      

      Original issue reported by mstrap

      Attachments

        1. 2_merge.zip
          3 kB
          Subversion Importer
        2. 1_repos.tar.gz
          23 kB
          Subversion Importer

        Issue Links

          Activity

            People

              Unassigned Unassigned
              subversion-importer Subversion Importer
              Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: