tag:blogger.com,1999:blog-27232680.post2973563308393547048..comments2024-03-20T06:54:32.435+01:00Comments on Plastic SCM blog: How to undo a mergeF3RD3Fhttp://www.blogger.com/profile/11524626976811746062noreply@blogger.comBlogger9125tag:blogger.com,1999:blog-27232680.post-79197038122379004552016-09-30T15:12:35.957+02:002016-09-30T15:12:35.957+02:00Yes, you can Cherrypick from 180 and then merge fr...Yes, you can Cherrypick from 180 and then merge from 181. It's going to be the same.Ma Nuhttps://www.blogger.com/profile/16216075572494383120noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-66913583427542866902016-09-30T15:07:51.469+02:002016-09-30T15:07:51.469+02:00Are you selecting the "Ignore traceability&qu...Are you selecting the "Ignore traceability" option for the cherry pick operation? Otherwise Plastic will see there's a path from the changeset to the destination and will conclude the merge is not needed (0 items to merge).Ma Nuhttps://www.blogger.com/profile/16216075572494383120noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-7633108880004131302016-09-30T11:59:56.433+02:002016-09-30T11:59:56.433+02:00Cherry picking from the faulty branch seems not to...Cherry picking from the faulty branch seems not to work like expected in Plastic SCM Version 5.4.16.768.<br /><br />I have a situation, where I had to subtractive merge a changeset interval, because the outcome had a bad performance. (It was not a bug, by the way.)<br />But there were also some good changesets within the "bad" branch. So I tried to cherry pick only the "good" changeset, the cherry pick tab opened correctly, but it says "0 items to merge".<br /><br />It seems to me, that Plastic SCM thinks internally, I want to merge the changeset instead of cherry picking it. (As far as I know, the cherry pick operation should not care about any merging history. It should simply take the changes and merge these with the current workspace.)<br /><br />Could this be a bug?Anonymoushttps://www.blogger.com/profile/00434445701069476414noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-24381685606996416932015-09-03T16:40:30.021+02:002015-09-03T16:40:30.021+02:00Any comment on TBBle's suggestions? Would a su...Any comment on TBBle's suggestions? Would a subtractive from 180 work equally well? Also, I suppose you _could_ do the last two merges in one checkin...Göran W.https://www.blogger.com/profile/08480594756782753172noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-72761482175486663052014-09-03T10:16:14.171+02:002014-09-03T10:16:14.171+02:00Why not do subtractive merge of 180, undoing the u...Why not do subtractive merge of 180, undoing the undo without needing to do a baseless cherry-pick. This would avoid having to redo any conflict resolution done in the first subtractive merge.<br /><br />Either way, your branch history now shows:<br />Add issue32<br />Add issue33<br />Back out buggy issue32<br />Re-add buggy issue32<br />Merge fix for issue32<br /><br />It'd be nicer if those last two commits could be handled as one commit, "Re-add fixed issue32".Anonymousnoreply@blogger.comtag:blogger.com,1999:blog-27232680.post-70899137717779787562014-08-05T21:17:13.438+02:002014-08-05T21:17:13.438+02:00Muy bueno Manu!
Saludos.-
Muy bueno Manu!<br /><br />Saludos.-<br />Fernando D. Bozzohttps://www.blogger.com/profile/03660957461576765989noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-40497962428241923032014-07-30T19:40:50.637+02:002014-07-30T19:40:50.637+02:00In this scenario after the "faulty" chan...In this scenario after the "faulty" changeset you have done several checkins. So you can't simply remove the cset because even if you could do it (which you can't) the change will be included in the next csets.<br /><br />Subtractive is the way to get this done right :-)Pablo Santoshttps://www.blogger.com/profile/08083682682597484025noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-43342302581843561702014-07-30T18:56:56.710+02:002014-07-30T18:56:56.710+02:00I'm also curious of why we would not want to j...I'm also curious of why we would not want to just delete the faulty changesets?Anonymoushttps://www.blogger.com/profile/11240740820568775025noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-25222758293938962322014-07-29T19:02:44.360+02:002014-07-29T19:02:44.360+02:00Very informative article. However, I wish you woul...Very informative article. However, I wish you would explain why you would want to use subtractive merges over "Delete changeset" and the side effects that can cause. Also, can you explain what "Cherry-pick (ignoring traceability)" means?prodlikehttps://www.blogger.com/profile/06485611117325971019noreply@blogger.com