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

svn log --use-merge-history uses to much from the branch history

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: 1.6.x
    • Fix Version/s: unscheduled
    • Component/s: cmdline client
    • Labels:
      None
    • Environment:

      Windows XP

      Description

      Background:
      I am using a large repository, with a trunk. From the trunk I created branches -
      then I worked in the branches and merged the changes back to the trunk. Also
      development happens in th trunk.
      
      From time to time I will create a change log on the trunk:
      
      svn log -v --stop-on-copy --use-merge-history -r {2010-01-01}:{2010-03-31}
      "workcopy"
      
      The bug is now, that the use-merge-history does NOT work as expected -
      it ignores the --stop-on-copy switch, because it includes the changes from the
      branch and the changes from the trunk before the branch has been created (so
      complete branch history incl. history from before).
      
      Also I would expect, that --use-merge-history only includes the changes that
      have been merged and not everything from the branch. When this would be the
      case, the ignore of --stop-on-copy would be no problem.
      
      Tested with svn 1.6.11
      
      Also the behaviour of use-merge-history costs a lot of time (hours/days) on
      large repositories, because when you have various branches and merged oft - the
      history of all branches including the trunk history they have been branched from
      will be included.
      

      Original issue reported by powerstat

        Attachments

          Activity

            People

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

              Dates

              • Created:
                Updated: