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

merge --reintegrate should handle renames better

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.5.6
    • Component/s: unknown
    • Labels:
      None

      Description

      When a file is renamed, or just copied, on a branch, 'svn merge --reintegrate'
      may not handle mergeinfo correctly for that file.  See the thread starting at
      this message for details:
      
         http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=135290
         From: Karl Fogel <kfogel@red-bean.com>
         To: dev@subversion.tigris.org
         Subject: reintegrate and renames
         Date: Wed, 20 Feb 2008 15:58:23 -0500
         Message-Id: <87ve4jqr9s.fsf@red-bean.com>
      
      (This may or may not be distantly related to issue #895 and issue #898.)
      

        Attachments

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              kfogel Karl Fogel
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: