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

Move + Merge => lose modifications

    Details

    • Type: Bug
    • Status: Reopened
    • Priority: Critical
    • Resolution: Unresolved
    • Affects Version/s: trunk
    • Fix Version/s: 1.12.0
    • Component/s: libsvn_client
    • Labels:

      Description

      If you move a folder in TRUNK, and merge this move in a BRANCH, svn will copy
      the files from TRUNK, and not move (relatively) the files from BRANCH.
      
      Which means you lose all modifications in BRANCH.
      I already lost many modifications because of this "feature" :\
      --
      Added : /TRUNK/TOMOVE/test.txt(Copy from path: /TRUNK/test.txt
      Deleted : /TRUNK/test.txt
      => Merge
      Added : /BRANCH/TOMOVE(Copy from path: /TRUNK/TOMOVE
      Deleted : /BRANCH/test.txt
      --
      

      Original issue reported by ozonegrif

        Attachments

          Issue Links

            Activity

              People

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

                Dates

                • Created:
                  Updated: