Jump to content

calbzam

Administrators
  • Content Count

    1,553
  • Joined

  • Last visited

  • Days Won

    37

calbzam last won the day on May 23

calbzam had the most liked content!

Community Reputation

62 Excellent

About calbzam

  • Rank
    Advanced Member

Profile Information

  • Gender
    Not Telling

Recent Profile Visitors

46,341 profile views
  1. Hi @Mikael Kalms, the issue should be already fixed in your dashboard. Regards, Carlos.
  2. Hi, Making a bit longer the left panel, the GUI seems to be at least usable. Could check if it helps? Regards, Carlos.
  3. Could you let us some more details of your workflow? Do you have multiple developers working on the same branch? I guess you are using Plastic GUI instead of Gluon? Regards, Carlos.
  4. Hi, I'm afraid the update-merge operation is not available if using cloaked rules: "Update-merge" is described as follows: If changes in the range [12-16] do not collide with the changes the developer made based on "11", then Plastic is able to do the following: it will download the new changes (not setting them as checked-out) and will effectively make the "checkouts on the workspace" depend on cset "16" instead of "11": It is important to highlight that this will only happen if the changes in [12-16] DO NOT collide with the changes the developer made based on "11", otherwise a regular merge will be launched. Now: there's a caveat to this behavior -> we do not let the update-merge run if there are cloaked rules in the workspace. We added a stronger restriction on release BL578. So, from BL578 update-merge doesn't work if there are cloaked rules in the workspace. Regards, Carlos.
  5. Hi, Plastic doesn't have specific pluginfor this tool but it will track all your changes thanks to the transparent scm feature: https://www.plasticscm.com/features/transparent-scm Plastic SCM detects all the actions you did and displays them together so you can quickly check them in and get back to coding. If you are working with binary files, we recommend you to follow the lock (exclusive checkout workflow) and using Gluon. This way, you will avoid conflicts with files that are not mergeable and you will keep the workflow very simple (Gluon is a very easy to use tool). https://www.plasticscm.com/gluon You can book a free training session with us in the following link to give you some more workflow recommendations and help you with the setup: https://calendly.com/codicesupport/60min Regards, Carlos.
  6. Yes, I'm afraid at the moment "comment "is not available in the format field. We could include it as a feature request. Regards, Carlos.
  7. If not moving the ".plastic" folder, you are not actually moving the workspace but creating a new one on a different location. But as you are moving the workspace content, it won't need to be downloaded again (only the workspace metadata is recreated in the new path). The proper way to move a workspace is via command (not manually). cm cwk --help But the user reported a problem with this command so we were trying to find a workaround. Regards, Carlos.
  8. Great! Thanks for the update. From the server web admin panel so you should be able to reset the repository server owner so you can recover if deny the permissions to ALL_USERS by mistake. Regards, Carlos.
  9. Hi, The problem may be that you need to re-run the merge operation from the "branch explorer" view in order top finish solving the merge conflicts and only at this point to you will be able to checkin your changes. If you do not find a workaround, please reach us at support@codicesoftware.com and we could arrange a GoToMeeting with you. Regards, Carlos.
  10. Hello Donald, We have a few resources where we explain this scenario and how and why Plastic is handling it this way: - "Conflicts during checkin – working on a single branch" section where we explain detail what is an update-merge operation in Plastic: https://www.plasticscm.com/book/#_conflicts_during_checkin_working_on_a_single_branch - Why checkin asks to update first? --> In this blog post, we start explaining what is merge tracking and why Plastic uses by default per-changeset merge tracking. It's very important you review the "Conflicts on main – why does new files come to my workspace?" section to properly understand this behavior http://blog.plasticscm.com/2018/02/why-checkin-asks-to-update-first.html Note that is blog post is a bit old and still mentions that Gluon is not able to handle merges. Please avoid this part as some months ago we improved Gluon to solve file conflicts. - What is the recommended workflow for binary files in conflict? If you are using Gluon, we recommend using locks. This way, you can avoid conflicts with not mergeable files (binary). https://www.plasticscm.com/documentation/administration/plastic-scm-version-control-administrator-guide#Chapter7:Configuringexclusivecheckout(Lock) I know that some of these Plastic concepts are not trivial and I would like to offer you a GoToMeeting session where we can review and focus on your specific cases. You can reach us at support@codicesoftware.com to schedule it. Regards, Carlos.
  11. Hi Tomar, Checking the "cm find" guide: https://www.plasticscm.com/documentation/cmfind/plastic-scm-version-control-query-system-guide#Codereviews You can use "comment" in the filtering options for the query. Is this what you need, right? Regards, Carlos.
  12. Hi, This message appears when you are trying to commit some changes but a merge operation is not finished. You can re-run the merge operation from the branch explorer to finish solving the conflicts or you can just undo the changes. If your pending to commit changes involve merge changes, you need to checkin all of them. You cannot partially only checkin some merge changes. Regards, Carlos.
  13. Hi, Thanks for reporting. Let me share with the team. I can also reproduce the issue. Regards, Carlos.
  14. Hi, I will try to push the task but I'm afraid it's not yet scheduled. Good to know that you at least found a workaround via GitServer. Regards, Carlos.
  15. Hello, this recalculation is somehow related to the Plastic plugin? I mean if you disable the Plastic integration, isn't it still happening? I think this hash recalculation... is directly handled by Unity when it considers necessary. We could open also a thread involving them to clarify. I think we haven't been reported a similar issue before. Are you evaluating Plastic? Regards, Carlos.
×
×
  • Create New...