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

delete/add with related causes missed tree conflict

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Open
    • Major
    • Resolution: Unresolved
    • all
    • ---
    • libsvn_delta
    • None

    Description

      Move, commit, add releated at original location, commit. Updates across the move don't see the 
      delete and so local modifications are not moved.
      
      svnadmin create repo
      svn import -mm repo/format file://`pwd`/repo/A/f
      svn cp -mm file://`pwd`/repo/A ^/B
      svnmucc -mm put repo/README.txt file://`pwd`/repo/A/f
      svn mv -mm file://`pwd`/repo/A/f ^/A/g
      svn cp -mm file://`pwd`/repo/B/f ^/A/f
      
      When updating from r3 to r5 the server sends a delta for A/f rather than an delete/add. This means 
      any local changes stay on A/f despite the file "moving" to A/g.
      

      Attachments

        Activity

          People

            Unassigned Unassigned
            philipm Philip Martin
            Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

              Created:
              Updated: