It's all about the answers!

Ask a question
QuestionsTagsUsersBadges
Guidelines | FAQ
Follow this question
Question details

×42,883
×12,009
×1,201
×889
×7

question asked: Apr 28 '16, 4:10 a.m.
question was seen: 3,957 times
last updated: Jun 08 '16, 1:27 p.m.

Related questions

How to reverse a changeset after merge

0
Wenwen Chen (11●1●1) | asked Apr 28 '16, 4:10 a.m.
edited Jun 08 '16, 1:27 p.m. by David Lafreniere (4.8k●7)
If I am working on a component, while other people have also modified the component and deliver their changesets. After I accept these changeset, there will arise automatically a merge change set, even if there is not any conflict. After that, I can not reverse the changeset anymore, neither using eclipse gui nor using lscm. Can some people help me?

One answer

Most liked answers ↑|Newest answers|Oldest answers

0
permanent link
Arun K Sriramaiah (3.2k●2●36●77) | answered Apr 28 '16, 5:08 a.m.
Hi Wenwen,

Please find the link below, its still same steps you have to follow even if you merged.

https://jazz.net/forum/questions/81423/how-to-roll-back-remove-delivered-change-sets-in-rtc

https://jazz.net/help-dev/clm/index.jsp?re=1&topic=/com.ibm.team.concert.dotnet.doc/topics/t_reversing_change_sets.html&scope=null

Regards,
Arun.
Comments
Ralph Schoon commented Apr 28 '16, 5:25 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER

Also see:
https://jazz.net/library/article/126
https://jazz.net/library/article/539

as interesting if questions come up.

Wenwen Chen commented Apr 28 '16, 8:46 a.m.

Hi Arun and Ralph,

Thanks for the answer.

I knew, how to reverse a changeset. But the problem is, a merge changeset will be automatically created. If two people worked at the same component parallel. I tried to reverse the changeset with your suggested method, but I get the error:

Error while discarding change set. Would create fork/conflict

Please help me.


Regards,


Wenwen

Geoffrey Clemm commented Jun 07 '16, 1:26 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER

You will need to be more precise about what exactly you are doing.
I do not see how a merge set would "automatically arise" in the scenario you are describing.
If you accept a change set that modifies a file that you have modified in a non-delivered change-set, you will get a conflict.
A merge change-set will be created if you then request a merge.
A "reverse" operation will create a patch, that you can than apply to your workspace to get another change set.
In none of these steps would a "discard" be performed, so you must be trying to discard a change set at some point (which isn't something you mentioned).

Your answer

Register or to post 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.