Bahram Posted June 21, 2012 Report Share Posted June 21, 2012 Summary of question: Is this a typical work flow and is this how the Plastic SCM is supposed work? Details: Today, I added my colleague to the database and we setup the code we want and i made a change to a file and he also made several changes to his files. So, i go ahead and do a "check in" from the top level directory tree and PSCM comes up with a "Pending Changes" window. In this window, under the Item column, i have two top level nodes that have subnodes under them. In the first node, the items have checks in their check boxes. The checkbox in the second main node is not checked, it says "[A] Added and private - 0 of 1420 items selected". The items in the second note are not mine, why do these items show up. Do we need to do something that they don't show up anymore? When my colleague makes some changes to files on his computer and checks them in. If i try to check my changes, it says that the items need to be merged, if i say ok, it pulls in his changes and i have to repeat my check-in. First, this is misleading as merging implies that the changes are to the same file. May be for the developer who is writting the Plastic SCM software the term "merge" here is appropriate but for users this is not at least what i am used to. I think the software here is pulling the changes from other users first. Second, as a user my past experience has been always to do an Update before a check-in to make sure i have everyone else's changes and see if they have changed the same file. The software used to tell me if there was a conflict. Then i would do a check-in and everything was kosher. Could you clarify? We have not changed any of the default configuration. Is there a configuration that is causing this behavior? At this point, my colleague is upset because the plastic scm is not working smoothly for him. I am the one who admins the servers. Do you guys have a roadmap of changes that you could send me so we can make a decision on his this software? Thank you, Bahram Link to comment Share on other sites More sharing options...
manu Posted June 21, 2012 Report Share Posted June 21, 2012 Check this out: Link to comment Share on other sites More sharing options...
psantosl Posted June 21, 2012 Report Share Posted June 21, 2012 You're most likely working on the same branch and you're generating changes at the same time. An update will help you get this issue solved, or a merge if the concurrent changes collide. We're about to release an enhancement that will run the update, if needed, prior to the checkin. Link to comment Share on other sites More sharing options...
carpediemevive Posted June 21, 2012 Report Share Posted June 21, 2012 bramoin, I know manu linked a youtube video (I don't know which one, youtube is blocked here), but you might find the video page in general useful: http://www.plasticscm.com/infocenter.aspx Also, the quick start guide goes through a lot of the basic information about how Plastic works, especially the GUI guide: http://www.plasticscm.com/infocenter/quick-start/plastic-gui.aspx It seems a lot of the issues you're facing might be just because you're use to how a particular type of version control works, and Plastic can seem similar but be different in some confusing ways. Some other useful links for you: The plastic user guide: http://www.plasticscm.com/releases/4.1/manuals-html/en/userguide.htm The plastic GUI guide: http://www.plasticscm.com/releases/4.1/manuals-html/en/guiguide.htm Also, the codice blog: http://codicesoftware.blogspot.com/ It seems trivial, but reading these things made me see some fundamental misunderstandings I was having and made my experience with Plastic a lot better. Link to comment Share on other sites More sharing options...
Bahram Posted June 22, 2012 Author Report Share Posted June 22, 2012 carpediemevive, psantosl and manu, thank you for the replies, the links and the videos. You guys are doing good. Sorry, I am a newbie using your product. I have read some of the documentation and watched some video. This one specifically was very helpful. I will look at the rest of the links as well. Yes, me and my colleague were working from the same branch. Looking forward to your next version. Do you have a time frame? Keep up the good work. Link to comment Share on other sites More sharing options...
manu Posted June 22, 2012 Report Share Posted June 22, 2012 We are not sure yet about the launching date. But we are going to prepare a section in the web called "Labs" where we will publish the newer internal releases as beta. Hopefully it will be ready the next week. Link to comment Share on other sites More sharing options...
carpediemevive Posted June 22, 2012 Report Share Posted June 22, 2012 bramoin, you can check out the old releases page to get a sense of how quickly new versions are released: https://www.plasticscm.com/download/oldreleases.en.aspx I've been pretty happy with the release cycle, it seems we get a new version every few weeks, and (for most releases) there's a good amount of changes that make it worthwhile to update. Link to comment Share on other sites More sharing options...
manu Posted June 22, 2012 Report Share Posted June 22, 2012 The update feature that is in the video up there is already in the current public release (4.1.10.302) Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.