<?jelly escape-by-default='true'?> <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form"> <f:entry title="Unshelve Changelist" field="shelf"> <f:textbox /> </f:entry> <f:entry name="resolve" title="Resolve Options" field="resolve"> <select name="resolve"> <option value="none">Resolve: None</option> <option value="as">Resolve: Safe (-as)</option> <option value="am">Resolve: Merge (-am)</option> <option value="ay">Resolve: Yours (-ay) -- keep your edits</option> <option value="at">Resolve: Theirs (-at) -- keep shelf content</option> </select> </f:entry> </j:jelly>
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#1 | 19599 | mparfianowicz | "Forking branch Main of p4-jenkins to mparfianowicz-p4jenkins." | ||
//guest/perforce_software/p4jenkins/main/src/main/resources/org/jenkinsci/plugins/p4/unshelve/UnshelveBuilder/config.jelly | |||||
#2 | 19519 | Paul Allen |
Jelly header update. <?jelly escape-by-default='true'?> |
||
#1 | 16514 | Paul Allen |
Unshelve and resolve build step. Implements a classic Jenkins Build step (i.e. not Workflow). Must provide a shelf change number and resolve options. The shelf change number supports variable expansion ${VAR}. |