rlewicki 0 Report post Posted May 20 Hi, I've got an issue when I try to cherry pick a changset it shows me proper files from picked change set, it resolves the conflict (if one exists) but when I press `Apply changes` it resolves whole branch that changeset is picked from e.g. I want to cherry pick changset with 8 modified files, I resolve conflict and then when I press `Apply changes` it resolves like 18000 files and shows all of them (sic!) in Pending changes once resolve is finished. Basically this feature doesn't work at all for me. Screenshots from steps provided below. And then when I press `Apply changes` this is what happens: It processes all the files on branch and addes them to `Pending changelist with following status. This is the result: Share this post Link to post Share on other sites
calbzam 71 Report post Posted May 21 Hi, I don't see the full path of the 7 change/delete conflicts. But they guess they are directories and inside this directories there are multiplel files that are copied during the cherry-pick operation. If you reach us at support@codicesoftware.com we can get connected review it in detail. Regards, Carlos. Share this post Link to post Share on other sites
rlewicki 0 Report post Posted May 21 Files are in specific directory along with only few other files. Why would any other file get copied during the cherry-pick? Isn't cherry-pick supposed to just copy files from specified changeset into current state of the repository I am in? At least this is how it works in git... Share this post Link to post Share on other sites
calbzam 71 Report post Posted May 21 The cherry picks just integrated the changes in the specific changeset (but not the previous changesets in the branch). If you reach us at support@codicesoftware.com we can get connected review it in detail the cherry-pick scenario with you. Regards, Carlos. Share this post Link to post Share on other sites
rlewicki 0 Report post Posted May 22 Why can't we solve it here so the solution is visible to other users and gets indexed to be easly find via internet browsers? I see no benefit of connecting since I cannot allow you to review my server anyway. Cheers, Robert Share this post Link to post Share on other sites
calbzam 71 Report post Posted May 22 Hi, I explained how the cherry-pick works. More information in the following link: https://www.plasticscm.com/book/#_cherry_pick_a_changeset But you report this is not the behavior you are seeing, Tha'ts why I was recommending a meeting to evaluate your specific scenario and then we can update the post with the results. regards, Carlos. Share this post Link to post Share on other sites
