It's all about the answers!

Ask a question

How do I refuse an incoming change set?


Randy Hudson (216142) | asked Mar 28 '07, 6:15 p.m.
FORUM MODERATOR / JAZZ DEVELOPER
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



permanent link
Philippe Krief (561155) | answered Mar 30 '07, 3:44 a.m.
JAZZ DEVELOPER
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

permanent link
John Camelon (1.7k14) | answered Mar 29 '07, 11:09 a.m.
JAZZ DEVELOPER
Randy Hudson wrote:
"John Camelon" <jcamelon@ca.ibm.com> wrote in message
news:eugdtu$3i4$1@localhost.localdomain...
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.

This is too complex for such a simple task as "Mark as Merged".

"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"
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.

How do I prime the history view for something which has been deleted?

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.

permanent link
Randy Hudson (216142) | answered Mar 29 '07, 10:59 a.m.
FORUM MODERATOR / JAZZ DEVELOPER
"John Camelon" <jcamelon@ca.ibm.com> wrote in message
news:eugdtu$3i4$1@localhost.localdomain...
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.

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"
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.

How do I prime the history view for something which has been deleted?
Is deleting an icon really a complex change set?

permanent link
John Camelon (1.7k14) | answered Mar 29 '07, 9:21 a.m.
JAZZ DEVELOPER
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
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


permanent link
Paul Vanderlei (56) | answered Mar 29 '07, 7:00 a.m.
Oops. Looks like John got here without any prodding! Thanks.

permanent link
Paul Vanderlei (56) | answered Mar 29 '07, 6:58 a.m.
I will try to coax an SCM expert from the development team to chime in
here.....

Your answer


Register or to post your answer.