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

tree-conflict for move in delete cannot follow move

    XMLWordPrintableJSON

    Details

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

      Description

      Tree-conflicts for moves inside deletes are not marked as involving a move and
      so cannot be resolved by following the move:
      
      svnadmin create repo
      svn import -mm repo/format file://`pwd`/repo/A/B/f
      svn rm -mm file://`pwd`/repo/A/B/f
      svn co file://`pwd`/repo@1 wc
      svn mv wc/A/B/f wc/f2
      svn rm wc/A/B
      svn up wc --accept postpone
      
      svn st wc/A/B
      D     C wc/A/B
            >   local dir delete, incoming dir edit upon update
      Summary of conflicts:
        Tree conflicts: 1
      
      The tree-conflict occurs when opening A/B and at that stage the change to the
      moved item has not been identified.
      
      See op-depth-test.c:move_in_delete XFAIL.
      

        Attachments

          Activity

            People

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

              Dates

              • Created:
                Updated:
                Resolved: