How do I refuse an incoming change set?
Let's say some developer on my team has deleted an icon in a project. I see
the delete as an incoming change, and I want to revert the other developers actions, restoring the resource to the project. Where is the Jazz analog to "Mark as Merged" or "Override and Commit"? TIA |
6 answers
I will try to coax an SCM expert from the development team to chime in
here..... |
Oops. Looks like John got here without any prodding! Thanks.
|
Another solution:
Accept the change set; this will delete the file, but you will be in sync with the stream. Then open the history view on the component in question. Select the change set underneath the one that caused the deletion, and run the "Show Repository Files" action. From there, you can browse to find the last state (prior to deletion) of the file, and "Load" it to bring it back. That change set can be delivered to the stream to undo that particular change. Alternatively, you can also accept the change set, and run the "Reverse" action from the history view in order to undo the entire change set, if that is what you so desire. We are still working out some of the kinks in reversing complex merge change sets, so your mileage may vary. Cheers, JohnC Randy Hudson wrote: Let's say some developer on my team has deleted an icon in a project. I see |
"John Camelon" <jcamelon@ca.ibm.com> wrote in message
news:eugdtu$3i4$1@localhost.localdomain... Another solution: This is too complex for such a simple task as "Mark as Merged". Alternatively, you can also accept the change set, and run the "Reverse" How do I prime the history view for something which has been deleted? Is deleting an icon really a complex change set? |
Randy Hudson wrote:
"John Camelon" <jcamelon@ca.ibm.com> wrote in message "Mark as Merged" implies that you had a conflict, not just an incoming deletion. If you had such a conflict in Jazz, you would "Resolve With Mine" and deliver your merge change set to the stream to restore the file. Alternatively, you can also accept the change set, and run the "Reverse" There isn't a UI hook without going into the Repository Files explorer, much as the example I described above. Is deleting an icon really a complex change set? No, my point was that we do know that there are some issues with reversing merge change sets. |
Randy,
Please, submit an enhancement to the jazz.net if you consider this point as a missing feature in Jazz. Then add a pointer to the new Work item in this thread to help newsgroup readers to follow up. Thanks Philippe |
Your answer
Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.