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

merge of non-empty subdir committed incorrectly

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Critical
    • Resolution: Fixed
    • all
    • 1.7.0
    • libsvn_wc

    Description

      I'll attach a shell script demonstrating this bug.  First, here's the recipe in
      prose:
      
         1. Create a repository /trunk, /branches, /branches/branchA, and
            /branches/branchB.  Both branches were branched from trunk,
            but that doesn't matter for this recipe.
      
         2. Check out a working copy of branchA.  In that wc, create a
            subdir, and at least one file in the subdir.  Run 'svn add'
            on the subdir, then commit.
      
         3. Check out a working copy of branchB.  In that wc, do
            'svn merge -rX:Y http://.../branches/branchA', where
            Y is the revision committed in step 2 above, and X is
            Y - 1.
      
         4. Commit the merge, producing revision Z.
      
         5. Run 'svn log -v -rZ http://FULL_REPOS_URL/'.  See the
            'R'eplace operation mentioned in the log.  It shouldn't
            be there.
      
      See about-to-be-attached script for details.
      

      Attachments

        1. 1_repro.sh
          2 kB
          Karl Fogel
        2. 2_merge_tests.py.diff
          5 kB
          Subversion Importer

        Issue Links

          Activity

            People

              Unassigned Unassigned
              kfogel Karl Fogel
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: