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

Cherry-pick merge scenario causes Svn to choke

Attach filesAttach ScreenshotAdd voteVotersWatch issueWatchersCreate sub-taskLinkCloneUpdate Comment AuthorReplace String in CommentUpdate Comment VisibilityDelete Comments
    XMLWordPrintableJSON

Details

    • Bug
    • Status: Open
    • Major
    • Resolution: Unresolved
    • 1.9.4, 1.9.5, 1.9.6, 1.10.x
    • None
    • None
    • None

    Description

      I've a shell script that allows for a repeatable series of merges between branches that, when done cherry-pick style, with ultimately cause Svn to lose context on what is merged and not merged.

      Scripts are here - https://github.com/paul-hammant/subversion_testing

      For fun, I ported the same scripts to Git, Mercurial and Perforce, and the same loss of context doesn't happen for them in a repeated cherry-pick situation.

      Attachments

        Activity

          This comment will be Viewable by All Users Viewable by All Users
          Cancel

          People

            Unassigned Unassigned
            paul Paul Hammant

            Dates

              Created:
              Updated:

              Slack

                Issue deployment