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

crash during tree conflict resolution

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 1.8.x
    • Fix Version/s: 1.8.1
    • Component/s: unknown
    • Labels:
      None

      Description

      The attached script causes a crash in 1.8.x and trunk.
      
      Output is as follows:
      
      + rm -rf crash
      + mkdir -p crash
      + mkdir -p crash/trunk
      + mkdir crash/trunk/epsilon
      + echo zeta
      + > crash/trunk/epsilon/zeta 
      + svnadmin create /tmp/crash/repos
      + svn import crash/trunk file:////tmp/crash/repos/trunk -m importing project tree
      Adding         crash/trunk/epsilon
      Adding         crash/trunk/epsilon/zeta
      
      Committed revision 1.
      + rm -rf crash/trunk
      + svn checkout file:////tmp/crash/repos/trunk crash/trunk
      A    crash/trunk/epsilon
      A    crash/trunk/epsilon/zeta
      Checked out revision 1.
      + svn rm crash/trunk/epsilon
      D         crash/trunk/epsilon
      D         crash/trunk/epsilon/zeta
      + svn ci -mm crash/trunk
      Deleting       crash/trunk/epsilon
      
      Committed revision 2.
      + svn mkdir crash/trunk/epsilon
      A         crash/trunk/epsilon
      + svn ci -mm crash/trunk
      Adding         crash/trunk/epsilon
      
      Committed revision 3.
      + svn up -r1 crash/trunk
      Updating 'crash/trunk':
      D    crash/trunk/epsilon
      A    crash/trunk/epsilon
      A    crash/trunk/epsilon/zeta
      Updated to revision 1.
      + svn mv crash/trunk/epsilon/zeta crash/trunk/zeta
      A         crash/trunk/zeta
      D         crash/trunk/epsilon/zeta
      + svn up crash/trunk --accept p
      Updating 'crash/trunk':
         C crash/trunk/epsilon
         A crash/trunk/epsilon
      Updated to revision 3.
      Summary of conflicts:
        Tree conflicts: 1
      + svn st crash/trunk
      !     C crash/trunk/epsilon
            >   local dir delete, incoming dir replace upon update
      A  +    crash/trunk/zeta
      Summary of conflicts:
        Tree conflicts: 1
      + svn resolve --accept mc crash/trunk/epsilon
      Segmentation fault (core dumped)
      

        Attachments

        1. 1_crash.sh
          0.6 kB
          Stefan Sperling

          Activity

            People

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

              Dates

              • Created:
                Updated:
                Resolved: