Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-38346

Rebase with upstream Subversion revision doesn't merge to HEAD

    XMLWordPrintable

    Details

    • Similar Issues:

      Description

      So i get this error:

      Caused by: org.tmatesoft.svn.core.SVNException: svn: E155015: One or more conflicts were produced while merging r9715:10320 into ....

      The problem is that 10320 is not the last revision number. The latest revision is 10958.
      Why is it merging with 10320? How can i change this?

        Attachments

          Activity

          Hide
          hugueschabot Hugues Chabot added a comment -

          The plugin does not simply rebase with HEAD. Instead it rebase with the SVN revision ID used in a specific build of the upstream. You can configure the rebase action to use the last build or the last stable build.

          You cannot change this but you can rebuild the upstream project. Or simply rebase manually.

          Show
          hugueschabot Hugues Chabot added a comment - The plugin does not simply rebase with HEAD. Instead it rebase with the SVN revision ID used in a specific build of the upstream. You can configure the rebase action to use the last build or the last stable build. You cannot change this but you can rebuild the upstream project. Or simply rebase manually.
          Hide
          luci0 Lucian Harhata added a comment -

          The plugin does a svn merge for revisions 0 - HEAD. The problem is that my mergeinfo property in svn is all over the place. It would be nice if i could select the start revision number.

          Show
          luci0 Lucian Harhata added a comment - The plugin does a svn merge for revisions 0 - HEAD. The problem is that my mergeinfo property in svn is all over the place. It would be nice if i could select the start revision number.

            People

            Assignee:
            kohsuke Kohsuke Kawaguchi
            Reporter:
            luci0 Lucian Harhata
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Dates

              Created:
              Updated: