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

avoid repeat merge in an intelligent way

    XMLWordPrintableJSON

    Details

      Description

      Refer the problem described by Folker Schamel here,
      http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=133164
      
      To summarize the detailed explanation above,
      When we merge from /branch1 to trunk_wc(of /trunk) we see what has already been
      merged from /branch1 and merge the rest of the revisions.
      This approach is shallow as it fails to detect the common merges when source and
      target received similar merge from same source in 2 different commits.
      
      Consider the following scenario where this approach could fail.
      merge rA from /branch1 to /branch2 and commit it in rB
      merge rB from /branch1 to /trunk and commit it in rC
      merge /branch2 to /trunk <---This merge should merge (rB ~ rA of /branch1)
      
      This is the follow-up thread
      http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=133393
      

      Original issue reported by kameshj

        Attachments

        1. 1_test4.sh
          1 kB
          Subversion Importer

          Issue Links

            Activity

              People

              • Assignee:
                Unassigned
                Reporter:
                subversion-importer Subversion Importer
              • Votes:
                0 Vote for this issue
                Watchers:
                2 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: