Jump to content

calbzam

Administrators
  • Content Count

    2,175
  • Joined

  • Last visited

  • Days Won

    52

Everything posted by calbzam

  1. Have you manually configured this tool as external merge tool, right? It seems the problem is this specific external merge tool is not able to handle this merge conflict. Are you facing this error for every merge conflict involving .prefab files or just this specific one? Regards, Carlos.
  2. Hi, if you drive to Preferences --> Merge tools, do you have defined any custom merge tool for .prefab files? It seems a problem with the external perge tool (UnityYAMLMerge). Regards, Carlos.
  3. Sorry for not being clear enough. The plugin to use is this one: In the repo link, it's also refered as the "The TeamCity Lightweight Plugin". Please review the the following sections: https://github.com/PlasticSCM/teamcityplug Installation requirements - The TeamCity Lightweight Plugin TeamCity Configuration Please let us know if it helps. Regards, Carlos.
  4. Hi, - I think the key is you have defined a stage "post" in the plug configuration. It's not mandatory and you can remove it from your configuration. 2020-10-16 13:10:54,176 INFO teamcityplug - stage: post - Also review that you have installed the "Mergebot plugin" but not the regular "Plastic SCM Teamcity plugin" that may be triggering a build every time a new changeset appears in the repo. Regards, Carlos.
  5. Hi, I've been reviewiong your TRUNKBOT log: 2020-10-16 13:09:08,653 INFO trunkbot - Processing branch /main/HCHB_MacAutorun attribute change... 2020-10-16 13:09:08,654 INFO trunkbot - Getting task number of branch /main/HCHB_MacAutorun ... 2020-10-16 13:09:08,655 INFO trunkbot - Building the merge report of task HCHB_MacAutorun ... 2020-10-16 13:09:08,657 INFO trunkbot - Trying to shelve server-side-merge from /main/HCHB_MacAutorun to /main 2020-10-16 13:09:08,667 INFO trunkbot - Testing branch /main/HCHB_MacAutorun ... 2020-10-16 13:10:54,136 INFO trunkbot - Checking-in shelved merged 9 from /main/HCHB_MacAutorun to /main 2020-10-16 13:10:54,168 INFO trunkbot - Checkin: Created changeset 1863 in branch /main 2020-10-16 13:10:54,168 INFO trunkbot - Setting branch /main/HCHB_MacAutorun as 'integrated'... At "13:09:08" "testing branch /main/HCHB_MacAutorun", and if we review the plug log at that time, TeamCity is running the build folder the shelve: sh:9@HavenPlastic@http://192.168.59.56:8087 020-10-16 13:09:08,676 INFO teamcityplug - Launch plan was requested. Fields: 2020-10-16 13:09:08,676 INFO teamcityplug - PlanName: Haven_Test_Configurations_TestMerge 2020-10-16 13:09:08,676 INFO teamcityplug - ObjectSpec: sh:9@HavenPlastic@http://192.168.59.56:8087 2020-10-16 13:09:08,676 INFO teamcityplug - Comment: MergeBot - Building branch /main/HCHB_MacAutorun 2020-10-16 13:09:08,676 INFO teamcityplug - Properties: 2020-10-16 13:09:08,676 INFO teamcityplug - branch.head.changeset.author: mjensen 2020-10-16 13:09:08,676 INFO teamcityplug - branch.head.changeset.guid: ed01e110-4457-45db-9266-ebf2f8916974 2020-10-16 13:09:08,676 INFO teamcityplug - branch.head.changeset.number: 1862 2020-10-16 13:09:08,676 INFO teamcityplug - branch.name: /main/HCHB_MacAutorun 2020-10-16 13:09:08,676 INFO teamcityplug - build.name: 2020-10-16 13:09:08,676 INFO teamcityplug - build.number: 2020-10-16 13:09:08,676 INFO teamcityplug - label: 2020-10-16 13:09:08,676 INFO teamcityplug - release.notes: 2020-10-16 13:09:08,676 INFO teamcityplug - repspec: HavenPlastic@http://192.168.59.56:8087 2020-10-16 13:09:08,676 INFO teamcityplug - stage: pre 2020-10-16 13:09:08,676 INFO teamcityplug - task.number: HCHB_MacAutorun 2020-10-16 13:09:08,676 INFO teamcityplug - trunk.head.changeset.guid: 71ee7ee1-9bc2-4c8c-89cf-3cc367afab09 2020-10-16 13:09:08,676 INFO teamcityplug - trunk.head.changeset.number: 1860 At "13:10:54" the shelve that was already tested is finally checked in into main: "Checking-in shelved merged 9 from /main/HCHB_MacAutorun to /main". After that, the "/main/HCHB_MacAutorun" branch is set as integrated and a new build is run for the recently created changeset 1863. 2020-10-16 13:10:54,176 INFO teamcityplug - Launch plan was requested. Fields: 2020-10-16 13:10:54,176 INFO teamcityplug - PlanName: Haven_Test_Configurations_TestMergePost 2020-10-16 13:10:54,176 INFO teamcityplug - ObjectSpec: cs:1863@HavenPlastic@http://192.168.59.56:8087 2020-10-16 13:10:54,176 INFO teamcityplug - Comment: MergeBot - Running plan after merging branch /main/HCHB_MacAutorun 2020-10-16 13:10:54,176 INFO teamcityplug - Properties: 2020-10-16 13:10:54,176 INFO teamcityplug - branch.head.changeset.author: mjensen 2020-10-16 13:10:54,176 INFO teamcityplug - branch.head.changeset.guid: ed01e110-4457-45db-9266-ebf2f8916974 2020-10-16 13:10:54,176 INFO teamcityplug - branch.head.changeset.number: 1862 2020-10-16 13:10:54,176 INFO teamcityplug - branch.name: /main/HCHB_MacAutorun 2020-10-16 13:10:54,176 INFO teamcityplug - build.name: 2020-10-16 13:10:54,176 INFO teamcityplug - build.number: 2020-10-16 13:10:54,176 INFO teamcityplug - label: 2020-10-16 13:10:54,176 INFO teamcityplug - release.notes: 2020-10-16 13:10:54,176 INFO teamcityplug - repspec: HavenPlastic@http://192.168.59.56:8087 2020-10-16 13:10:54,176 INFO teamcityplug - stage: post 2020-10-16 13:10:54,176 INFO teamcityplug - task.number: HCHB_MacAutorun 2020-10-16 13:10:54,176 INFO teamcityplug - trunk.head.changeset.guid: b69336f0-ffb6-4e8e-a53e-722b08d036fa 2020-10-16 13:10:54,176 INFO teamcityplug - trunk.head.changeset.number: 1863 Regards, Carlos.
  6. If you somehow find a reproducible scenario, we would like to get connected with him. You can temporary disable the FsWatcher with the following setting in your "client.conf" (although I still don't have any certany that this is the problem). <WatcherEnabled>no</WatcherEnabled> Regards, Carlos.
  7. Hi, The editor we are using is developed by ActiPro.It seems they still don't have support for Python 3.6. Could you also share your problem in the following link? https://www.actiprosoftware.com/community/thread/24996/does-syntaxeditor-python-language-add-on-for Sorry for the inconveniences, Carlos.
  8. Hi Mikael, Do you have any user who is able to easily reproduce it? The log information you are attaching is everything for the same second (not 7 seconds). Could you attach the full log and let us know the stimated time when the freeze happened? Regards, Carlos.
  9. Why don't you run a query "cm find changeset..." instead of manually typing the changeset id inside the file content? The same happens if you need to query any changeset/branch metadata information: https://www.plasticscm.com/documentation/cmfind/plastic-scm-version-control-query-system-guide Not sure if you are aware of our mergebots feature. It allows to automate the branch intergation and it's based on the branch attribute value: https://www.plasticscm.com/mergebot-devops We are considring a new feature that allows to shelve/checkin individual lines or hunks as opposed to the entire file. Regards, Carlos.
  10. Hi, Why are are you editing the file content to match the cs you re working one? Why don't you use a different approach like using "attributes"? Could you describe the details of your workflow to understand why are you doing it this way? Do you need to keep under version control the file where you set the project version if then, you don't want to merge these changes? You could add this file to the hidden changes list (or keep it as private) so this way, you are not facing merge conflicts with it. Regards, Carlos.
  11. Hi, Could you attach the Plastic server debug log to review it? Also please attach the "server.conf" file. Regards, Carlos.
  12. Ok, thanks for the update. Regards, Carlos.
  13. Hi,- We've seen Windows installations having a bad/corrupt/useless "C:\Windows\System32\java.exe" "tool" which is supposed to be like a "pseudo-symlink" to the latest JVM installed on the machine. That causes a failure.Can you check if removing (temporally) this file solves the issue? You'll need to restart Semantic Merge.- This option allows to manually indicate the custom Java path:eg: semanticmergetool.exe -vm="C:\Program Files\Java\jre7\bin\java.exe" -b=base.java -s=source.java -d=destination -r=result.java You can include this option in your configuration file. Regards,Carlos.
  14. Hello, Have you manually moved the "client.conf" to this path? By default, it shouldn't be there. Anyway, assigning the necessary permissions to the file should prevent this error to happen. Regards, Carlos.
  15. I think the key with new files is to understand that there is an extra status that is not Private (Plastic is not tracking the file) and is neither Controlled (checked-in). This is the status when you add the files to source control so Plastic is tracking them but the files are not still checked in. The ignore rules are only applyed to Private files. In git there is a similar status (add vs commit): https://www.quora.com/What-is-the-difference-between-the-add-and-commit-commands-in-Git Regards, Carlos.
  16. Hi, Did you perform this changes via the Unity plugin or in the Windows explorer? Because if you perform the changes directly in the Unity GUI, Plastic shouldn't need to match/guess the changes and all the moved/renamed items should be correct. If you disable the "Find moved and renamed files and directories", does it help? Regards, Carlos.
  17. Hi, When you copy some new files in your Plastic workspace they are initially "Private". Then, you can add the file to version control. It doesn't mean they are already checked-in (controlled). If you add a new file to version control, it will be "Added/Checked-out" and that's why it appears in the "Pending changes" view. For instance, If you add to source control a file that was previously "Private/ignored", it will appear in "Pending Changes". PD: The same happens if you have a controlled file that is included in "hidden_changes.conf". As soon as you checkout the file, it will appear in pending changes. All the files you actively add to source control or checkout will appear in the "Pending Changes" list. Regards, Carlos.
  18. Hi,You can only ignore the items that are not still under source control ("private" items in the GUI). In your screenshot I can see these items are already added to sourcde control/checked-out. If you undo the changes, they should appear again as Private so you can ignore them.For the already under source control items, the list to use is "hidden changes".https://www.plasticscm.com/book/#_ignoring_private_files_with_ignore_conf Regards,Carlos.
  19. calbzam

    Error: zlib64

    Hi, Could you reboot the machine (or at least Unity Hub) and try again? We have a report from a user with the same error and rebott fixed the problem.Sorry for the inconveniences,Carlos
  20. Hi, Doesn't it fit with the scenario ruben explained? If it's not, could you provide the same logs logs ruben was requesting? Sorry for the inconveniences, Carlos.
  21. If you want to assign different permissions per repository, you can customize it in the Plastic GUI --> Repositories list --> right-click a repo --> Permissions. All the users accessing the cloud repos need to be invited first to the cloud organization. After they belong to the cloud organziation, you can customize the permissions for them. You can allow access to the desired users and to the desired repos. https://www.plasticscm.com/documentation/security/plastic-scm-version-control-security-guide Plastic also has a fature that allows to reuse existing repos as part of other projects: Xlinks. It's the equivalent to git submodules. From your previous comment, I'm not sure if you are using them https://www.plasticscm.com/documentation/xlinks/plastic-scm-version-control-xlinks-guide Projects often need to reuse existing components that have been developed and are actively used as part of other projects. Plastic SCM encourages using separate repositories for different projects and components, and access shared components by "mounting" them in the project repository through Xlinks. This chapter will introduce what are Xlinks and how to use this powerful feature to share components among projects that evolve in parallel. Regards, Carlos.
  22. Are you considering using a local repo so the checkin/update/merge oeprations are faster and then you connect to the remote one just to push/pull your changes? Regards, Carlos.
  23. Hi, The following tasks change the way were processing the XML output. https://github.com/jenkinsci/plasticscm-plugin/pull/36 https://github.com/jenkinsci/plasticscm-plugin/pull/37 They are not still public (most probably later this week) but I think they should fix your problem. Regards, Carlos.
  24. Hi, Please attach the Plastic client logs so we can review the error stack trace: C:\Users\xxx\AppData\Local\plastic4\logs Regards, Carlos.
  25. Hi, It's not recommened to work in the asset when the checkin is running. How long does the checkin take? Does it fit with your network speed and asset size you are uploading? Regards, Carlos.
×
×
  • Create New...