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

replaced merge source causes assertion during automatic merge

    Details

    • Type: Bug
    • Status: Resolved
    • Priority: Critical
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.8.0
    • Component/s: libsvn_client
    • Labels:
      None

      Description

      Another side effect of automatic merge's violation of merge source normalization
      (see http://subversion.tigris.org/issues/show_bug.cgi?id=4138#desc5).  Depending
      on how that issue is addressed this *should* be fixed too.
       
      1.8-dev>svn copy A branch-1
      A         branch-1
      
      1.8-dev>svn copy A branch-2
      A         branch-2
      
      1.8-dev>svn ci -m "Make some branches"
      Adding         branch-1
      Adding         branch-2
      
      Committed revision 2.
      
      1.8-dev>svn up -q
      
      1.8-dev>svn del A
      D         A
      D         A\B
      D         A\B\E
      D         A\B\E\alpha
      D         A\B\E\beta
      D         A\B\F
      D         A\B\lambda
      D         A\C
      D         A\D
      D         A\D\G
      D         A\D\G\pi
      D         A\D\G\rho
      D         A\D\G\tau
      D         A\D\H
      D         A\D\H\chi
      D         A\D\H\omega
      D         A\D\H\psi
      D         A\D\gamma
      D         A\mu
      
      1.8-dev>svn copy branch-1 A
      A         A
      
      1.8-dev>svn ci -m "Replace 'trunk' with a branch"
      Replacing      A
      
      Committed revision 3.
      
      1.8-dev>svn up -q
      
      ### Merge source with replacement asserts:
      
      1.8-dev>svn merge ^^/A branch-2 -v
      --- Checking branch relationship
      --- Calculating automatic merge
      --- Merging
      ..\..\..\subversion\libsvn_client\merge.c:4569: (apr_err=235000)
      svn: E235000: In file '..\..\..\subversion\libsvn_client\merge.c' line 4569:
      assertion failed (apr_hash_count(implicit_src_mergeinfo) == 1)
      
      This application has requested the Runtime to terminate it in an unusual way.
      Please contact the application's support team for more information.
      
      ### 1.7.9-dev works, so this is a regression.
      
      >svn merge ^^/A branch-2
      --- Recording mergeinfo for merge of r2 into 'branch-2':
       U   branch-2
      --- Recording mergeinfo for merge of r3 into 'branch-2':
       G   branch-2
      

        Attachments

          Issue Links

            Activity

              People

              • Assignee:
                Unassigned
                Reporter:
                pburba Paul Burba
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: