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

Propagate relevant SVN user to UI in case of merge conflicts

XMLWordPrintable

    • Icon: New Feature New Feature
    • Resolution: Unresolved
    • Icon: Major Major
    • jigomerge-plugin
    • None
    • all

      In case of a merge conflict, Jigomerge should propagate the Subversion user to the Jenkins UI whose commit led to the conflict and thus is the person who should address the conflict. The necessary information are available as part of that specific Subversion revision.

          [JENKINS-12993] Propagate relevant SVN user to UI in case of merge conflicts

          Jeff Fillmore added a comment - - edited

          I have a little work around for this:

          1. Excute shell command 
            grep -R conflictingFiles ../builds/${BUILD_NUMBER}/log | sed -n -e 's/^return : .* conflictingFiles={\(.*\)}}/\1/' -e 's/.*=\(.*\)2[0-9][0-9].*/name=\1/p' > ../builds/${BUILD_NUMBER}/conflict.txt
          2. Inject environment variables 
             ../builds/${BUILD_NUMBER}/conflict.txt
          3. Now you can use environment variable $name in any additional steps. We use it with the hipchat notifications

          Jeff Fillmore added a comment - - edited I have a little work around for this: Excute shell command grep -R conflictingFiles ../builds/${BUILD_NUMBER}/log | sed -n -e 's/^return : .* conflictingFiles={\(.*\)}}/\1/' -e 's/.*=\(.*\)2[0-9][0-9].*/name=\1/p' > ../builds/${BUILD_NUMBER}/conflict.txt Inject environment variables ../builds/${BUILD_NUMBER}/conflict.txt Now you can use environment variable $name in any additional steps. We use it with the hipchat notifications

            Unassigned Unassigned
            michaelhuettermann Michael Hüttermann
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated: