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

Propagate implied merge info on WC -> WC copy/move operations

    XMLWordPrintableJSON

Details

    Description

      Treat all revisions from a 'copy' source as merge info for the
destination.  This equates to turning all those revs into actual
merge info (target merge info = source revs + source merge info).

Remaining work:

* Handle WC -> WC 'copy'/'move' operations.  (dlr)
  http://subversion.tigris.org/merge-tracking/func-spec.html#wc-wc-copy-move

  Update (2007/04/23): Discussion with some Subversion dev Googlers
  indicates that we should purposely break command-line UI
  compatibility here, and instead require an explicit option to
  avoid contacting the repos.

      http://subversion.tigris.org/merge-tracking/func-spec.html#wc-wc-copy-move

      Attachments

        1. 8_patch.txt
          19 kB
          Daniel Rall
        2. 7_patch.txt
          16 kB
          Daniel Rall
        3. 6_mypatch.diff
          15 kB
          Paul Burba
        4. 5_patch.txt
          14 kB
          Daniel Rall
        5. 4_patch.txt
          13 kB
          Daniel Rall
        6. 3_patch.txt
          14 kB
          Daniel Rall
        7. 2_patch.txt
          12 kB
          Daniel Rall
        8. 1_patch.txt
          4 kB
          Daniel Rall

        Issue Links

          depends upon

          Bug - A problem which impairs or prevents the functions of the product. SVN-2853 do_single_file_merge() lacks comprehensive "Replace-style merge" capability

          • Major - Major loss of function.
          • Closed

          Improvement - An improvement or enhancement to an existing feature or task. SVN-756 Make "svn cp A B; svn mv B C" work, and be equal to "svn cp A C"

          • Major - Major loss of function.
          • Closed
          is blocked by

          Bug - A problem which impairs or prevents the functions of the product. SVN-2853 do_single_file_merge() lacks comprehensive "Replace-style merge" capability

          • Major - Major loss of function.
          • Closed

          Improvement - An improvement or enhancement to an existing feature or task. SVN-756 Make "svn cp A B; svn mv B C" work, and be equal to "svn cp A C"

          • Major - Major loss of function.
          • Closed

          Activity

            People

              Unassigned Unassigned
              dlr Daniel Rall
              Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: