EdDev Posted February 7, 2013 Report Share Posted February 7, 2013 Hello, Could you please explain how this merge is working? We found that it can be done only to whole branches and not to specific changesets, is there any special reason for this? Thanks, Ed. Link to comment Share on other sites More sharing options...
manu Posted February 7, 2013 Report Share Posted February 7, 2013 Hi Ed! well you may want to take a look into the following articles: http://codicesoftware.blogspot.com/2012/05/cherry-pick-vs-merge.html and http://www.plasticscm.com/releases/3.0/manuals_html/en/UserGuide-EN.htm#_Toc266201393 On the other hand, it's possible to cherrypick from certain changesets, it's not restricted to branches so open the branch explorer -> Click in a changeset -> CherryPick from this changeset. You can even do it from a changeset interval, just click one cset, ctrl+click to another one, right click in the last one and -> "Cherry picik from this changeset interval". The changeset interval MUST be connected otherwise it will do anything Link to comment Share on other sites More sharing options...
EdDev Posted February 7, 2013 Author Report Share Posted February 7, 2013 Cool I missed the CherryPick from a CS one. Can you explain what is a changeset interval? Thanks. Link to comment Share on other sites More sharing options...
calbzam Posted February 7, 2013 Report Share Posted February 7, 2013 Hello, Each time you check in a set of new revisions, whether it’s a single file or an entire source tree, Plastic SCM records the entire set of revisions as a changeset. (Git and Mercurial call them “commits”.) In our documentation, we explain more in detail (http://www.plasticscm.com/releases/4.1/manuals-html/en/userguide.htm#_Toc323124547). But if you have more questions, don´t hesitate to ask Regards, Carlos Link to comment Share on other sites More sharing options...
EdDev Posted February 7, 2013 Author Report Share Posted February 7, 2013 Hello, I was actually referring to: "Cherry picik from this changeset interval". I'm not clear what it does different here (compared to "CherryPick from this changeset"). Thanks, Ed. Link to comment Share on other sites More sharing options...
manu Posted February 7, 2013 Report Share Posted February 7, 2013 Hi Ed! a changeset interval is a consecutive list of changesets that are connected through the parent relationship. For example: A and C are a changeset interval. A and B are a changeset interval C and B are NOT a changeset interval. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.