<?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 | |
---|---|---|---|---|---|
#5 | 22858 | Paul Allen |
Merge pull request #54 from mihailogazda/master. P4Unshelve build step can now be skipped successfully if the changelist ID is not set. |
||
#4 | 22315 | Paul Allen |
Pending change cleanup for unshelve. Unshelve would leave files open for add/edit/delete, the 'tidy' option will 'revert -k' the files leaving the content in the workspace, but removing the 'have' list data. Unshelve can now specify a Credential and Workspace, important for situations where more than one sync occurs in a pipeline script. JENKINS-43430 |
||
#3 | 20246 | Paul Allen |
Convert merge options for unshelve to ListBoxModel Option (from basic jelly) @atiniir |
||
#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}. |