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

tree conflict at directory external causes assertion to fail

    XMLWordPrintableJSON

    Details

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

      Description

      Reported in
      http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2387071
      
      In file 
      'D:\Development\SVN\Releases\TortoiseSVN-1.6.3\ext\subversion\subversion
      \libsvn_wc\tree_conflicts.c' 
      line 568: assertion failed (strcmp(dir_path,
                                  svn_path_dirname(victim_path, pool)) == 0)
       
      Encountered this error while reverting in a folder which had a tree
      conflict. I right clicked in the folder and chose SVN Revert and clicked
      OK, which immediately caused this error. I had to remove the conflicted
      folder to solve the problem. The folder which caused the tree conflict
      was included by the svn:externals property. The tree conflict was caused
      by a merge above this folder.
      
      
      1. So my structure was: svn://repo/branch/X, with svn:externals Y
         from svn://repo/trunk/X/Y;
      
      2. I merged a revision from trunk (containing modifications of
         svn://repo/trunk/X/Y) to branch;
      
      3. A tree conflict occurred for svn://repo/branch/X/Y (which is an
         external included folder);
      
      4. I could not revert svn://repo/branch/X.
      

      http://svn.haxx.se/dev/archive-2011-03/0682.shtml#20110326233039.GA13938@daniel3.local

        Attachments

        1. 4_issue-3469.sh
          2 kB
          Stefan Sperling
        2. 3_Test.zip
          40 kB
          Subversion Importer
        3. 2_Memory.txt
          0.9 kB
          Subversion Importer
        4. 1_Callstack.txt
          2 kB
          Subversion Importer

          Issue Links

            Activity

              People

              • Assignee:
                Unassigned
                Reporter:
                stsp Stefan Sperling
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: