Jump to content


  • Content Count

  • Joined

  • Last visited

  • Days Won


calbzam last won the day on October 8

calbzam had the most liked content!

Community Reputation

82 Excellent

About calbzam

  • Rank
    Advanced Member

Profile Information

  • Gender
    Not Telling

Recent Profile Visitors

47,072 profile views
  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@ 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@ 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@ 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@ 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@ 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.
  • Create New...