Jump to content

calbzam

Administrators
  • Posts

    3,118
  • Joined

  • Last visited

  • Days Won

    115

Posts posted by calbzam

  1. In the previous comments, the user seemed to have switched to different branches with pending changes, but I guess this is not your case, right? 

    Quote

    .  I set merge to revert to source on all the proposed merge files and was left with a "pending merge link" in Pending Changes.  It says that the pending merge links will be commited when I checkin my changes or undo my changes.  However, when I try to checkin, I get an error that I cannot checkin due to the pending merge link and I don't want to undo - I'll lose 4 hours of work! 

    I guess you can't checkin because the merge hasn't been fully processed. If you try to re-run the merge again from the branch explorer, aren't still some merge conflicts to process?

    Not sure about your time zone, but if you reach us at support@codicesoftware.com, we can arrange a meeting to take a look with you.

    Regards,

    Carlos.

  2. Hi,

    Let me try to understand. You have Plastic hosted server in your office. From the server machine, you can open a client and there is no problem accessing, checking the repos...

    When a client tries to connect from a  different machine, you are getting this error? When configuring the client is the "Check connection" working? It seems like a network related issue.

    Could you temporary disable the firewall on the server machine?

    Regards,

    Carlos

     

  3. Hi,

    If you have a private file in your workspace with the same name, but it's not under source control, Plastic can't resolve any evil twin merge. The way Plastic handles it is renaming it to .private. This way, your local file is overwritten.

    If Plastic was aware of this file, it will perform an evil-twin merge but if the file is private (not under source control), Plastic can't merge it.

    Regards,

    Carlos.

  4. Hi Marc,

    From the Plastic GUI --> Preferences, you can configure the external merge tools (eg: UnityYAMLMerge). Plastic just try open the external merge tool based on the configured parameters. You need to be sure the external tool path and required parameters are correct. 

    I've found this Unity guide where they explain how to configure UnityYAMLMerge with third party tools (like Plastic SCM):

    https://docs.unity3d.com/Manual/SmartMerge.html

    Regards,

    Carlos.

  5. Hi, you can reach us at support@codicesoftware.com when you remove your cloud repos to disable encryption. The path for "cryptedservers.conf" file on Windows should be:

    C:\Users\carlos\AppData\Local\plastic4 --> for the client-side operations encryption

    C:\Program Files\PlasticSCM5\server --> for the server-side operations encryption

    Regards,

    Carlos.

  6. Hi,

    Once the encryption is enabled you cannot disabled it. Your data will be already encrypted in the cloud repos so you will need the key to decrypt this data. We don't know your encryption password. It's locally saved in your "server" folder or your "plastic4" user folder. You should have a "cyptedservers.conf" if you entered the key before.

    If you want to fully disable encryption in your cloud organization, we can manually do it. But you will need first to remove all your cloud repositories.

    Regards,

    Carlos.

  7. Hi,

    - If you right-click the file and select "Add to ignore list" and refresh the view, isn't it marked as ignored?

    - Could you attach your "ignore.conf"? (Check in your local workspace and also in your user folder: "C:\Users\xxx\AppData\Local\plastic4\ignore.conf")

    - Do you have a "plastic-global-config" repo that may be overwriting some rules?

    https://www.plasticscm.com/documentation/administration/plastic-scm-version-control-administrator-guide#Globalfileconfiguration

    Regards,

    Carlos.

  8. Hi,

    - How are you defining the shared libraries in the Jenkins configuration? Could you attach some screenshots of your build settings? Reading some documentation, I can see you can define Global shared Libraries following these steps: https://jenkins.io/doc/book/pipeline/shared-libraries/ 

    Is this what you are configuring, right?

    - Why don't you use Plastic Xlinks for your shared libraries/repos? Doesn't it help as a workaround?

    Regards,

    Carlos.

    library.png

  9. Hi,

    - You can open a console and run "cm version".

    - Is the parent folder fully checked or the whole workspace content fully checked?

    - The next time it happens, it would be great to focus on the unchecked file and review the last changes: if it was moved by your coworker, renamed...

    - I guess you are not using this workspace with the regular Plastic GUI, right?

    - There is a command line option that you may find useful to know:

    [New]
    Gluon UI: The option '--restorefulldirs' was added to the 'partial configure' command. This option allows resetting the directory configuration in partial workspaces.

    Check 'cm partial configure --help' for more info.

    Regards,

    Carlos.

  10. Hi,

    From our release notes:

    [New] 5.4.16.688

    Now a full hierarchy of submodules can be added. It is possible to have repositories as follow:

    default/codice
    default/codice/plasticscm
    default/codice/plasticscm/windowsgui
    default/codice/semanticmerge

    Before only 1 level of submodules was allowed, but now a full hierarchy can be created, which is useful when a certain namespace policy must be enforced.

    All the submodules inside a given repository are stored inside the same database as the repository, actually using different table name prefixes or schemas in the case of SQL Server.

    Remarks:

    • A submodule can't be moved to a different repo. It stays on the repo where it was created.
    • A submodule can be moved "inside" a different submodule and submodule hierarchies can be freely modified just applying repository rename operations. It means you can start with
     default/codice
     default/codice/plasticscm
     default/codice/plasticscm/windowsgui

    And transform the hierarchy as follows:

     default/codice
     default/codice/plasticscm
     default/codice/windowsgui


    And even rename "codice" to "plastic-code" and then:

     default/plastic-code
     default/plastic-code/plasticscm
     default/plastic-code/windowsgui

     

    • When you delete a submodule, you delete all the submodules inside it!
      • Remember that delete doesn't really remove the submodule, it stays on the database and it is just unlinked from Plastic (as happens with repositories).
    • A submodule inherits permissions from its parent submodule. When you move a submodule, the permissions from the new parent will be applied.

     

    Best regards,

    Carlos.

×
×
  • Create New...