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

Merge on subdirectory does not work

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Minor
    • Resolution: Not A Problem
    • 1.9.x
    • None
    • None
    • None
    • Commandline client on any operating system has this issue.

    Description

      Attached reproduction script shows the issue in detail.

      A short description of the issue:

      • Doing "svn merge -c -1000 foo/bar" does not revert changes in the foo/bar subdirectory
      • Doing "cd foo bar" before doing "svn merge -c -1000 ." reverts the changes

      Both of the above should be equivalent and the former seems to be a bug. In the below thread, it was also shown that diff can have hte same behavior.

      Discussion about this bug was done here: https://mail-archives.apache.org/mod_mbox/subversion-users/201804.mbox/%3C20180415141034.GA31629%40ted.stsp.name%3E

       

      Attachments

        1. repro-template.sh
          4 kB
          Chris

        Activity

          People

            Unassigned Unassigned
            svnchris Chris
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: