Jump to content
Plastic SCM forums are now in Unity. Click here to open the new forum ×

calbzam

Administrators
 View Profile  See their activity

  • Posts

    3,118

  • Joined

  • Last visited

  • Days Won

    115

 Content Type 

Posts posted by calbzam

  1. xlink and ignored files

    in General

    Posted

    Hi,

    The "ignore.conf" needs to be stored at the root of the workspace. Doesn't matter if the ignore rules apply to the parent repo or some Xlinked repo.

    If you have a "ignore.conf" in some subfolder (eg: Xlink), these rules won't be taken into account.

    Regards,

    Carlos.

    • Like 1

  4. xlink and ignored files

    in General

    Posted

    Hi,

    The ignore rules should be applied to private items doesn't matter if the belong to an Xlinked repo or not. Note that the ignore rules doesn't apply to items that are already under source control. In that case, you will need to add them to the hidden changes list.

     

    Regards,

    Carlos.

    • Like 1

  11. Update workspace with pending changes

    in General

    Posted

    Hi,

    In modern SCMs we need to think as changeset/commit like the basic unit. So you are not merging single files but changesets.

    Quote

     

    1. I'm on version 500 of foo.c, and I start making changes to it on lines 20-22.  My working copy is now tracking this.

    2. Elsewhere, version 501 of foo.c is checked in, with a bugfix on line 45.

    3. I hit update on my workspace, and rather than detecting this discrepancy between my local copy and version 501, it just leave my working copy alone.  So the bugfix on line 45 is lost, but the changes on lines 20-22 are preserved.   It doesn't tell me about this, and I have no real way of noticing.

     

    Following these steps, if I try to update my workspace and this update involved a file conflict, Plastic will detect it and it will propose you to run a merge:

    Resolving a merge is not a problem as soon as you are working with text files. image.png files

     

    Regards,

    Carlos.

  12. GitSync ERROR

    in Git interop

    Posted

    Hi @amineoxstudios,

    Quote

    You may notice that it still asked me to unload the item (from the configuration view) in both scenarios.

    We can ignore these error messages. It's a localization error but it shouldn't affect the sync operation. We are about to fix it.

    In your screenshot, I can seee the initial sync with a Bitbucket repo was succesful.

    Regards,

    Carlos.

  14. Update workspace with pending changes

    in General

    Posted

    Hi,

    - If you are using the Plastic GUI, the basic unit is the changeset (similar to git) and the default workflow is the branck per task workflow (you create the task branch before start performing changes on the files).  The workspace is always pointing to a specific changeset and you cannot update/merge indiviudual files but changesets. This design makes the merge performance in Plastic/git much better than other SCMs.

    Even if you don't have cheked-out items but just locally changed items, we need to be careful when switch to different branch because the following error could happen:

    https://plasticscmsupport.zendesk.com/hc/en-us/articles/360014970894-The-parent-revision-of-the-item-is-inconsistent-with-the-loaded-one-in-changeset-cs-xxx

    - In the scenario you are mentioning I guess both developers are workinng on the same branch. This fits with a Gluon workflow (not Plastic GUI). Gluon is the GUI designed for artists or developers working with binary files.

    In Gluon, the basic unit is the file (similar to SVN). The workspace structure is more flexible. You can potentially update/load items from different changesets. If you forgot lock/checkout an item and there is a conflicts, Gluon will be able to resolve the merge conflict for this specific file.

    More details in the following blog post: https://blog.plasticscm.com/2019/10/incoming-changes.html

    Please let us know if it helps.

    Regards,

    Carlos.

     

  19. Trimming to reduce size of the database

    in General

    Posted

    Hi,

    Thanks for your feedback. In this thread there were multiple comments but most of them had something in common (having a way to reduce the size of the repository so you can control storage growth of the repos). For now, we addapted the existing "cm archive" command to be supported in the cloud.

    I will share your feedback with the product team so your comments are considered for future improvements.

    Regards,

    Carlos.

    • Thanks 1

  22. How to activate automatic commit of new / deleted files ?

    in Installation and configuration

    Posted

    Hi,

    Thank you for reaching out to us. Sorry to hear that you are experiencing this behaviour.

    I suspect that the additions and deletions were not selected to be checked in on the Pending Changes view. Please can you review the workspace where you pushed your changes and confirm whether there are outstanding items to check-in?

    The Plastic SCM client does not automatically select these items, all changes made need to be reviewed in the Pending Changes view. If you really want to check in everything without reviewing the items, this can be done via the CLI...

    cm checkin --all --private

    I hope this information is helpful to you. Please let me know if you have any further queries or concerns, and I will be happy to assist.

    Regards,

    Carlos.

×
×
  • Create New...