Jump to content

derkork

Members
  • Posts

    50
  • Joined

  • Last visited

Everything posted by derkork

  1. So are there any plans to add the Plastic IntelliJ plugin to the JetBrains plugin repository? This would make installing it a lot easier.
  2. I installed MacPlastic 5.4.16.701 and it seems to work pretty well with that.
  3. Awesome, thank you very much, I'll check out out right now
  4. Okay great, at least it's somewhat working, I don't mind pressing Ctrl+c at the end. Thanks for all your help
  5. That worked. However it's still hanging at the end. ~/devel/tools/plasticscm/cm sync databuilder@my-server.de:8087 git https://github.com/derkork/test-data-builder.git --user="myuser" --pwd="mypassword" Receiving references... | Receiving references... /- master: Local changes (ef86d37) - 0 changesets to pull - 6 changesets to push Receiving references... OK There are changes to push. Exporting... OK4/6 Packaging...... OK Uploading... ... OK Synchronization completed Results: - Object count: 0 - Branches: 1 - Changesets involved: 6 - Branches with conflicts: 0 failed to suspend thread 0xb043f000, hopefully it is dead failed to suspend thread 0xb041d000, hopefully it is dead ^C On a related note, is there a way to store the credentials in a file so I don't have to add them as command line parameters (which is unsafe as anyone running ps on the machine can see my password then)?
  6. Nope, still no luck: ~/devel/tools/plasticscm/cm sync databuilder@my-server.de:8087 git https://github.com/derkork/test-data-builder.git --user "myusername" --pwd "mypassword" Error: The settings you've introduced don't match with the stored ones for branch/repo databuilder. Stored are: https://github.com/derkork/test-data-builder.git failed to suspend thread 0xb043f000, hopefully it is dead failed to suspend thread 0xb041d000, hopefully it is dead ^C
  7. Yes I am using the regular terminal window (v2.5.3). OSX version is 10.10.5. I resolved the merge conflict and retried the push, but I got this: ~/devel/tools/plasticscm/cm sync databuilder@my-server.de:8087 git https://github.com/derkork/test-data-builder.git Receiving references... / - master: Local changes (ef86d37) Receiving references... - - 0 changesets to pull - 6 changesets to push Receiving references... OK There are changes to push. Error: The credentials introduced for the repository are not valid failed to suspend thread 0xb043f000, hopefully it is dead failed to suspend thread 0xb041d000, hopefully it is dead ^C I was unable to find any documentation about how to set up git credentials with plasticscm so I don't know how to resolve this.
  8. j.thomae$ /Library/Frameworks/Mono.framework/Versions/Current/bin/mono ./cm.exe sync databuilder@my-server:8087 git https://github.com/derkork/test-data-builder.git Receiving references... \ Receiving references... /The branch(es) /main has more than one head. Please, merge it to be able to continue synchronizing failed to suspend thread 0xb043f000, hopefully it is dead failed to suspend thread 0xb041d000, hopefully it is dead << HERE I issued the kill call Full thread dump: failed to suspend thread 0xa0b331d4, hopefully it is dead ^C The kill call seemed to try to dump a thread dump but nothing of actual use was printed on the console. After the kill call I still had to Ctrl+C the process.
  9. Ok, I tried to merge this stuff in the GUI client's branch explorer. This didn't work out either, I got this wenn I clicked on "Process all merges": The contents of .plastic4/guiclient.conf are: .plastic4 j.thomae$ cat guiclient.conf switchtobranch=False comparisonmethod=NotIgnore mergeresolutiontype=Forced showhiddenchangeditems=False commitshowchanged=True lastusedrepserver=my-server.de:8087 commitshowdeleted=True commitcalculatemanuallymoved=True resultencoding=NONE showignoreditems=False commitmovedtxtonlysameextension=False commentshistorysize=10 commitmovedbinonlysameextension=True commitshowprivates=True commitshowcheckouts=True lastusedrepository=databuilder@my-server.de:8087 encoding=NONE *sigh* - it seems like this really isn't ready for primetime yet.
  10. Just installed 692. Still no luck: ./cm sync databuilder@my-server.de:8087 git https://github.com/derkork/test-data-builder.git Receiving references... / Receiving references... -both contributors. Receiving references... OK Compressing objects... OK Downloading... OK Processing objects:... | - 1 changesets to pull - 6 changesets to push There are changes to push and pull. Will pull the remote changes then you'll have to merge them and push the changes back. Processing objects:... OK Importing... OK1/1 Synchronization completed Results: - Object count: 3 - Branches: 1 - Changesets involved: 1 - Branches with conflicts: 1 -- master failed to suspend thread 0xb043f000, hopefully it is dead failed to suspend thread 0xb041d000, hopefully it is dead ^C Tried again: j.thomae$ ./cm sync databuilder@my-server.de:8087 git https://github.com/derkork/test-data-builder.git Receiving references... / Receiving references... \The branch(es) /main has more than one head. Please, merge it to be able to continue synchronizing failed to suspend thread 0xb043f000, hopefully it is dead failed to suspend thread 0xb041d000, hopefully it is dead ^C I had to Ctrl+C the process because it wouldn't stop on its own. Apart from that: how and where I would do the merging that plastic asks me to do?
  11. ps aux | grep mono j.thomae 57124 0.0 0.1 729916 11236 ?? S 9:42AM 0:04.00 /Library/Frameworks/Mono.framework/Versions/Current/bin/mono /Users/j.thomae/devel/tools/plasticscm/cm.exe shell --defaultencoding --commfile=/Users/j.thomae/Library/Caches/IntelliJIdea15/tmp/cmshell5399200528490680672javaDotNet j.thomae 57119 0.0 0.1 703464 9440 ?? S 9:42AM 0:00.53 /Library/Frameworks/Mono.framework/Versions/Current/bin/mono /Users/j.thomae/devel/tools/plasticscm/cm.exe shell --defaultencoding --commfile=/Users/j.thomae/Library/Caches/IntelliJIdea15/tmp/cmshell2722499935348091847javaDotNet j.thomae 57114 0.0 0.1 703964 9064 ?? S 9:42AM 0:00.62 /Library/Frameworks/Mono.framework/Versions/Current/bin/mono /Users/j.thomae/devel/tools/plasticscm/cm.exe shell --defaultencoding --commfile=/Users/j.thomae/Library/Caches/IntelliJIdea15/tmp/cmshell8803805598739512565javaDotNet j.thomae 57109 0.0 0.1 703964 9100 ?? S 9:42AM 0:00.51 /Library/Frameworks/Mono.framework/Versions/Current/bin/mono /Users/j.thomae/devel/tools/plasticscm/cm.exe shell --defaultencoding --commfile=/Users/j.thomae/Library/Caches/IntelliJIdea15/tmp/cmshell8886097833476942497javaDotNet j.thomae 57104 0.0 0.1 703964 9116 ?? S 9:41AM 0:00.52 /Library/Frameworks/Mono.framework/Versions/Current/bin/mono /Users/j.thomae/devel/tools/plasticscm/cm.exe shell --defaultencoding --commfile=/Users/j.thomae/Library/Caches/IntelliJIdea15/tmp/cmshell4213764275984196958javaDotNet It seems that this still needs some work. Even after closing down IntellIJ there are still a lot of plastic shells running and they are not going away. I had to manually kill them.
  12. Yep it is working with these binaries. I wonder why it wouldn't work with the ones inside the macplastic.app folder, shouldn't these be the same?
  13. Contents of the CM script: #!/bin/bash DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) /Library/Frameworks/Mono.framework/Versions/Current/bin/mono $DIR/cm.exe $@ Output of mono --version $ /Library/Frameworks/Mono.framework/Versions/Current/bin/mono --version Mono JIT compiler version 3.0.3 (master/39c48d5 Tue Jan 8 12:12:24 EST 2013) Copyright (C) 2002-2012 Novell, Inc, Xamarin Inc and Contributors. www.mono-project.com TLS: normal SIGSEGV: altstack Notification: kqueue Architecture: x86 Disabled: none Misc: softdebug LLVM: yes(3.1svn-mono) GC: Included Boehm (with typed GC)
  14. Well, a bit better, but still not quite there... j.thomae$ ./cm sync databuilder@my-server.de:8087 git https://github.com/derkork/test-data-builder.git Receiving references... - Receiving references... \both contributors. Receiving references... OK Compressing objects... OK Downloading... \ 2/3Error: Stream terminated early failed to suspend thread 0xb03bd000, hopefully it is dead failed to suspend thread 0xb039b000, hopefully it is dead Nothing arrived at GitHub.
  15. Hello Manu, that worked. Thanks. Seems like the Mac platform isn't yet a first class citizen for PlasticSCM. I hope that will change in a future release. Thanks for you help! Jan
  16. Hi Manu, yes i have added it to path variable. And I am running this with a normal user, not root. The same user was used for the shell and IntelliJ. I also set up the full path the in the plugin's settings in IntelliJ, just to make sure. I have attached my setup to this post. When I click the "test connection" button, i get this in the log: 2015-09-17 16:56:51,141 (null) j.thomae at (null) ERROR cm - Plastic client version: 5.4.16.689 2015-09-17 16:56:51,168 (null) j.thomae at (null) ERROR cm - Argument cannot be null. Parameter name: path Same happens when I enable version control for a project. On a related note, the configuration of macplastic is really a mess on Macs. The config files reside somewhere deep in /Applications/macplastic.app and require root rights for them to change. As an additional nuisance they get overwritten when you update the application. MacPlastic should read the configuration files from $HOME/.plastic4 instead.
  17. Hmm, sorry that didn't work out: $ cm sync databuilder@my-server.de:8087 git https://github.com/derkork/test-data-builder.git Receiving references... \Error: Could not load file or assembly 'Microsoft.TeamFoundation.VersionControl.Client, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' or one of its dependencies.
  18. Hmm, that didn't work so well: Error:Plastic SCM detected the following error: Unable to communicate with Plastic SCM command line shell - Error running command line client on shell mode. The 'cm shell' command was launched but the process terminated abnormally.Warning:The Plugin is now working offline. You can still working normally but SCM operations will no be effective in the Plastic SCM server until you re-connect again. In order to re-connect, please go to Plastic SCM menu, and uncheck the option "work offline" once the server connection is restored. When I run the cm shell command from the command line, it works so far: $ cm shell status cs:3@rep:databuilder@repserver:xyz.de:8087 CommandResult 0 Is there a way to get some more info about what went wrong?
  19. I couldn't find any option to create a git synchronization in MacPlastic. Does the client actually support this? If not how can I create a git synchronization on the command line?
  20. Hello Manu, any news about the plugin so far?
  21. Hello Manu, I'm using IntelliJ 14 and 15 EAP. The cm-Tool is already in my path variable
  22. Good morning, I just wanted to install the PlasticSCM IntelliJ plugin on a mac, but it doesn't seem to be included in the MacPlastic installer. Could you maybe just make the plugin available on the global plugin repository (https://plugins.jetbrains.com/), where all the world is publishing plugins for IntelliJ ? That way everyone could easily install it through the IntelliJ IDE just like any other plugin and I guess it would also make some people aware of PlasticSCM. Until then, where can I get a copy of the IntelliJ plugin on the Mac? Jan
  23. I had this issue recently as well. I was working on a mac and trying to sync with a server on Linux. The problem in my case was that I specified the remote server as my.remote-server.com:8088 On windows you got a checkbox to tell Plastic that the server uses SSL. On Mac there is no such checkbox. So the URL must be entered as ssl://my.remote-server.com:8088 Otherwise plastic will connect using non-encrypted mode and this will give you the error message from the first post. So if you want to connect via SSL make sure your URL starts with ssl://
×
×
  • Create New...