Jump to content

All Activity

This stream auto-updates     

  1. Past hour
  2. 1. I don't have .NET 4.5.1, but I do have 4.8. 2. Yes, I have highly unusual date and time format setup. Here is the relevant part of plastic.debug.log: 2020-01-23 14:45:33,667 \F ERROR plastic - Plastic SCM client version: 8.0.16.3868 2020-01-23 14:45:33,668 \F ERROR plastic - Error message: String was not recognized as a valid DateTime. 2020-01-23 14:45:33,769 \F DEBUG plastic - StackTrace: at System.Windows.Forms.Control.MarshaledInvoke(Control caller, Delegate method, Object[] args, Boolean synchronous) at System.Windows.Forms.Control.Invoke(Delegate method, Object[] args) at Codice.I3.I3Control.InvokeMethod(Control c, Delegate method, Object[] args) at am1.bj() at am1.g() at aop.a()
  3. Yesterday
  4. Hello Carlos, Thank you for listening to your customers' feedback! This is great and hopefully makes Plastic better. Cheers, Francois
  5. @Eric Carter Thank you very much for your feedback. It's clear that we need to make an effort to improve our icons. We will also take into account your suggestions and will try to make this "grid" more usable.
  6. It's a mix of all those things, but I think the grid layout is inescapably wandersome. With a grid layout there's no way I can read it like a list, top to bottom or left to right and find what I need. The icons just add extra space to the already scattered grid layout. Grids are great if the icons are expressive enough or familiar enough that you don't need the words, you can just hone in via a color/shape/details heirarchy. But in Plastic, with a list of complex abstract actions, many of which are only rarely used, I'm always going to be relying on the words, which means I need to do a lot of reading, which means list are a lot better of an arrangement.
  7. In that case, you can use the subtractive merge operation: https://www.ylasticscm.com/book/#_removing_changes_subtractive_merge Regards, Carlos.
  8. No, no, this is not confusing at all. I understand perfectly what you're describing, but you're answering a different question than I'm asking. You're describing how I can make my local workspace match the state of changeset 4. What I'm asking is how do I generate an changeset which is the inverse of changes 5 through 9, that when committed, will leave the remote repository's contents bitwise equal to the state it was in in changeset 4. I am attempting to generate changeset 10, a change which removes all the changes in changesets 5 through 9. Whether my local workspace is pointed at changeset 4, 5, 9, or 10 after I am done isn't important.
  9. We just released a new feature so if somebody deletes/renames the branch you are working, you can still undo your local changes so your workspace is not broken anymore: [Bug] 8.0.16.3433 All platforms - Plastic, Gluon: We improved the behavior when you have local changes and the changeset loaded in your workspace is deleted by a different user. Before these improvements, this meant that you got stuck: at that point you were unable to checkin, shelve or undo your local changes. We modified the client behavior to enable you to undo your local changes, letting you out of that loophole. Shelving or checking them in will still be unavailable, as they wouldn't have a parent changeset. The 'undo' behavior will be slightly different depending on the client you use: Gluon will always allow you to undo the local changes. If the original contents aren't available anymore, the head contents of the current branch will be used instead. Plastic, on the other hand, will notify you about the inconsistency and then ask you for confirmation to undo all your local changes and update the current workspace. Regards, Carlos.
  10. I just wanted to bump this. This is making branch renaming a hazard; we don't rename branches that often, but when we do we never know if we might break someone's workspace completely. Are there any fixes planned? Again, thank you; we just want to make Plastic as robust as it can be! Francois
  11. Plastic allows to configure your favorite external merge tool: Kdiff3,... You can if in the "Prefereces" panel --> "Merge tools". In the following link we explain the features of our built-in text diff and 3-way merge tool. Your feedback is welcome: https://www.plasticscm.com/features/xmerge Regards, Carlos.
  12. Is there a command line call to determine the changeset of the xlinked repo within a workspace? If not, is there an API available for writing a tool to do so? Example: Repo Blue has an x-link to Repo Red. I create a workspace for Repo Blue, which pulls down the contents of Repo Red as well. I cd to a directory within Red's hierarchy and call "cm status" The result is cs:<CHANGESET OF BLUE>@Blue@ ... (head) What I want to query is the changeset of Red. (The repo xlinked by Blue)
  13. I understand but this view is very annoying not only for me but also for the rest of my team. Especially this bottom window where we see all 3 pieces of code and additionally background colors are almost undifferentiated
  14. Hi Joel, In this blog post, we provided a solution for distributed locks but let me explain you why this is not good at all: - If you follow this workflow, and you checkout an item, then if your coworker tries to checkout the same item, they will have a message alerting that the items is locked by you. So far do good. - When you checkin your changes, you coworker will be able to checkout the item is his local repo. Them problem is you cannot be sure that your coworker has previouly pulled your branch so they may not be working with the last item version. So technically they will be able to locally lock the item and commit the changes. But as soon as they try to push their changes to the central repo, they will figure out that they were not working with the last version and they will need to resolve a conflict. NOTE: It's in our roadmap to fully support distributed locks but for now our recommendation is following a centralized workflow if you need to use locks. Regards, Carlos.
  15. Hi, I'll share it with the team. Thanks! Let us know if you need anything else. Best regards, Héber.
  16. Hello, We have a sync server trigger but I'm afraid triggers are not supported in the cloud. It would only work in your local server. https://github.com/PlasticSCM/syncservertrigger We also have a tool called CmdRunner that I think will be help ful. Please check the "Handling different servers: The replicator" section. https://www.plasticscm.com/documentation/cmdrunner/plastic-scm-version-control-cmdrunner-guide#Handlingdifferentservers:Thereplicator Regards, Carlos.
  17. If we don't use the base contributor all the merges will be manual (not automatic merges). In the following guide we explain the advantages of 3 way merge (source, base and destination) vs 2 way merge (source and destination): https://www.plasticscm.com/documentation/advanced-version-control-guide Regards, Carlos.
  18. Thank you for the reply Carlos. In most cases I don't use basefile. (I don't remember situation when I choose something from basefile) Sometimes when I'm trying to merge there is annoying mess at he bottom window. It's hard to choose correct piece of code. If I have only source and destination it would be much easier to choose appropriate code.
  19. Last week
  20. Hello, This post http://blog.plasticscm.com/2014/11/orchestrate-your-development-with.html explains how to set up exclusive checkout in a distributed server setup. Can we use this with the official plastic cloud? Can we tell our server to use the plastic cloud server as the file locking manager? Thank you for your answers
  21. Hello, in our setup we manually push selected branches from our premise server to the cloud. But we want to pull all branches from the cloud to our server. The processes run automatically via a timed batch script. My pull command looks like: cm pull "/main/dev@repo@org@cloud" repo@server:8087 I tried to use wildcards (*, %) like cm pull "/main/dev/*@repo@org@cloud" repo@server:8087 -------------------^ but nothing worked. Is there some way to pull the (child) branches recursively? I put "child" in parentheses, because we are fine with pulling all branches from the cloud (we just don't want to push everything there). The more complicated way I can think about would be: getting a list of all cloud branches and then pulling each branch separately. That would be weird and uncomfortable and I think there must be another way (GUI "sync" can do this, is there a log of commands called from the gui?). Thank you all
  22. Could you also attach the "plastic.debug.log.txt"? The stack trace and the detailed log may give us some more clues. Do you have installed NET 4.5.1 in your machine? Does the machine use any specific culture/language that may be using a different calendar? Regards, Carlos.
  23. Windows 7, 64 bit. 2020-01-21 15:31:38,751 \F WARN DPISettings - LoadLibrary failed. API must not be available SetProcessDpiAwareness 2020-01-21 15:31:39,211 \F INFO LeapMotionController - Leap motion configuration file has not been detected 2020-01-21 15:31:39,227 \F INFO CmConnectionCredentials - Using profile [localhost:8087_UPWorkingMode] to connect to [localhost:8087] 2020-01-21 15:31:39,230 \F INFO CmConnectionCredentials - Using profile [localhost:8087_UPWorkingMode] to connect to [localhost:8087] 2020-01-21 15:31:39,317 \F ERROR MainForm - String was not recognized as a valid DateTime. 2020-01-21 15:31:39,358 \F INFO CmConnectionCredentials - Using profile [localhost:8087_UPWorkingMode] to connect to [localhost:8087] 2020-01-21 15:31:39,613 \F INFO CmConnectionCredentials - Using profile [localhost:8087_UPWorkingMode] to connect to [localhost:8087] 2020-01-21 15:31:39,633 \F INFO CmConnectionCredentials - Using profile [localhost:8087_UPWorkingMode] to connect to [localhost:8087] 2020-01-21 15:31:39,635 \F INFO CmConnectionCredentials - Using profile [localhost:8087_UPWorkingMode] to connect to [localhost:8087] 2020-01-21 15:31:39,637 \F INFO Serialization - ChangesetExtendedInfoArray [23] deserialized in 0 ms. 2020-01-21 15:31:39,640 \F INFO CmConnectionCredentials - Using profile [localhost:8087_UPWorkingMode] to connect to [localhost:8087] 2020-01-21 15:31:39,641 \F INFO CmConnectionCredentials - Using profile [localhost:8087_UPWorkingMode] to connect to [localhost:8087] 2020-01-21 15:31:39,647 \F INFO CmConnectionCredentials - Using profile [localhost:8087_UPWorkingMode] to connect to [localhost:8087] 2020-01-21 15:31:39,648 \F INFO CmConnectionCredentials - Using profile [localhost:8087_UPWorkingMode] to connect to [localhost:8087] 2020-01-21 15:31:39,653 \F INFO CmConnectionCredentials - Using profile [localhost:8087_UPWorkingMode] to connect to [localhost:8087] 2020-01-21 15:31:39,654 \F INFO CmConnectionCredentials - Using profile [localhost:8087_UPWorkingMode] to connect to [localhost:8087] 2020-01-21 15:31:39,985 \F ERROR LogoCustomizer - Unable to retrieve http://www.plasticscm.com/externalcontent/logos/plasticscmlogoi3.png image, Parameter is not valid. 2020-01-21 15:31:40,279 \F ERROR plastic - Plastic SCM client version: 8.0.16.3868 2020-01-21 15:31:40,279 \F ERROR plastic - Error message: String was not recognized as a valid DateTime. I attached my system time and date format.
  24. Thanks! The ability to push and pull metadata changes, even if only for one specific branch, might actually be the thing we'd need for our workflow to be at least somewhat workable. We can then communicate the needed for review branches with other methods, such as issue tracking. PS. Integration with HacknPlan would be dope!
  25. Hi Jani, I'm afraid Code Review replication is not supported, so it won't be fully functional in your setup. But, don't panic, as there are some options. First, to send the metadata without needing to create a new changeset, you can right-click on the branch, then "push/pull" and then push the branch. This way, all the metadata should be sent. The other option is to work directly against cloud, but it is not what you want. You can still perform code reviews, however, you won't be able to change the status when checkin in, you won't be able to see the comments GUID. I think this stands for questions a and c. For question b, you can create a code review directly to cloud without needing to create a new workspace. Just go to the repositories view, right click the desired repo, view branches, and then new code review for the desired branch. As I have said, this way you can create code reviews, but replication is still not supported, so you will be able to get it, but not to submit the status change directly. Tell me if I haven't been clear, or if there is anything else I can help you with. Best regards, Héber.
  26. Being unable to shelving on the cloud was a major disappoint for us. We gave it for granted until the day we needed to use it and found out that it was not possible. Please add our upvote to this feature. Thanks!
  27. We've been looking for options to integrate Code Reviews to our development process. As we've been using PlasticSCM quite a while now, the logical method would be to use the internal Code Review system that's already been implemented to PlasticSCM. However, we've been hitting a wall with this. The single biggest problem of using the built-in code review is that we use PlasticSCM as a distributed SCM, and none of our programmers connect straight to the Cloud Repository. Now, as I understand the code review process in PlasticSCM, it'd look a bit like this: 1. Select a branch you are ready to merge 2. Create a new code review for that branch 3. Some other programmer regularly checks code reviews, and sees there is a new code review present 4. This programmer then proceeds to review the code, comments and requests changes and clarifications accordingly 5. Now the original programmer checks the code reviews, and processes new comments and acts accordingly 6. Once everyone is satisfied, the code review is marked as Reviewed, and the merge can go on ahead Now, suppose Programmer A has created a code review on their local workspace, that needs to be addressed by Programmer B. Programmer B now subsequently checks their Code Review tab, and they find nothing. It seems the information hasn't moved at all. As far as I know, the code review information is moved between servers with metadata. However, you cannot push only a metadata change to some other server, thus the only way to move the information about the code review would be to also make a file change that you could push. So now, we have a few additional steps: 2a. Touch a file to change it and check-in to local 2b. Sync repositories The other way we could make this work is to have a workspace that connects straight to the cloud, and only use code reviews on that workspace. This however creates a lot of possibilities for confusion, and it's not the direction we want to go. So the question remains: How to either a) automatically or semi-automatically send code review data to the cloud server and back to local or b) change the code reviews window to actually access the cloud repository's code reviews while everything else is connected to local or c) streamline the sharing of code review information between distributed local servers some other way to prevent the need for creating a small change and a useless commit just to send a code-review comment?
  1. Load more activity
×
×
  • Create New...