defensezone@gmail.com Posted November 23, 2015 Report Share Posted November 23, 2015 Hello. Help! Thanks. Link to comment Share on other sites More sharing options...
darcy_vr Posted November 24, 2015 Report Share Posted November 24, 2015 Also getting this issue when trying to merge. Am I missing something obvious? Link to comment Share on other sites More sharing options...
defensezone@gmail.com Posted November 24, 2015 Author Report Share Posted November 24, 2015 I do not understand. it can be corrected, or this option is not available in the cloud? Link to comment Share on other sites More sharing options...
manu Posted November 25, 2015 Report Share Posted November 25, 2015 Hi all, the merge operation is not supported for the cloud server. It's not a uncontrolled error, it's something not supported. Link to comment Share on other sites More sharing options...
darcy_vr Posted December 1, 2015 Report Share Posted December 1, 2015 Sorry if this is a stupid question, but is this a feature that's going to be added in later? Link to comment Share on other sites More sharing options...
manu Posted December 2, 2015 Report Share Posted December 2, 2015 Hi Darcy, not stupid at all. It's an operation that impacts on the overall performance, it's not noticeable for a single Plastic SCM server but it's for the cloud server. We have to study it. Link to comment Share on other sites More sharing options...
tmammela Posted December 8, 2015 Report Share Posted December 8, 2015 I don't understand. I made two branches from main - development and a certain task. Now the task is complete but I can't merge back to development. There must be something I misunderstood, otherwise this product is useless... Link to comment Share on other sites More sharing options...
tmammela Posted December 15, 2015 Report Share Posted December 15, 2015 Judging by the lack of response, it seems I really understood correctly, that this cloud is only supporting a single branch with no merging. I will see if I will transfer to running my own plastic server or some other solution... Link to comment Share on other sites More sharing options...
manu Posted December 15, 2015 Report Share Posted December 15, 2015 Hi! I'm sorry, let me try to explain it better. The cloud allows you to work: 1) Regular mode: like Github, push and pull branches. (tons of branches, merges, labels...) 2) Gluon mode: like a central server, using gluon as your client that means only one branch and no merges. 3) Mixed mode: Some people will use the gluon mode using the cloud as a central server and some other will pull and push branches. Link to comment Share on other sites More sharing options...
tmammela Posted December 20, 2015 Report Share Posted December 20, 2015 Hi! I'm sorry, let me try to explain it better. The cloud allows you to work: 1) Regular mode: like Github, push and pull branches. (tons of branches, merges, labels...) 2) Gluon mode: like a central server, using gluon as your client that means only one branch and no merges. 3) Mixed mode: Some people will use the gluon mode using the cloud as a central server and some other will pull and push branches. So how to enter regular mode so I won't get this "the merge is not currently available in the cloud server" error? Link to comment Share on other sites More sharing options...
calbzam Posted December 21, 2015 Report Share Posted December 21, 2015 Hi, You pull the cloud branches into your local server, then you can perform the merge in your local server (with very good performance) and finally push the merge result into the cloud server again. Regards, Carlos. Link to comment Share on other sites More sharing options...
LaserCannon Posted February 8, 2016 Report Share Posted February 8, 2016 Hi there, We're new to Plastic SCM and thought that the Cloud would be a good way to get us into Plastic, since we can't really afford to have our own server right now. It sounds to me like it is impossible to merge branches without a dedicated local server. Or, instead "local server," can we use our local machine? Either way, how would I go about "pulling the cloud branches to my local server"? When learning about Plastic, I was not introduced to the concept of "Push" and "Pull." If it turns out that we cannot merge, we cannot use this tool, and we would begrudgingly go back to git. I also strongly suggest that you include a better explanation and guidance in-app when the user is faced with this issue. Just saying "oh thats not supported" is undermining what makes this tool useful. -Bryant Link to comment Share on other sites More sharing options...
manu Posted February 9, 2016 Report Share Posted February 9, 2016 Hello Bryant, I would love to explain you (and anyone else who wants to join us) how the cloud works. We can discuss about the Cloud, Plastic Gluon and distributed development. What do you think? Something like 8 or 9 AM PST usually works for me. Link to comment Share on other sites More sharing options...
OPjp Posted February 11, 2016 Report Share Posted February 11, 2016 Signed up for cloud today to test out PlasticSCM for a Unity project and ran into this as well. Not being able to merge seems to contradict the philosophy of Plastic SCM (branch per task etc). Hi, You pull the cloud branches into your local server, then you can perform the merge in your local server (with very good performance) and finally push the merge result into the cloud server again. Regards, Carlos. Is there a guide that goes into detail? I have a local server to test this workflow.. how do I pull branches from the cloud? Link to comment Share on other sites More sharing options...
manu Posted February 12, 2016 Report Share Posted February 12, 2016 hello! the eval guide will show you how tu pull content to your local server, create changes, merge them and finally push them back to the remote server (cloud). -> https://plasticscm.com/documentation/labs/main.shtml If you have any question or you feel it's not enough I'm still available for an online meeting, we can also get your feedback and write a small blogpost. So feel free to ask! Link to comment Share on other sites More sharing options...
OPjp Posted February 12, 2016 Report Share Posted February 12, 2016 Doesn't that guide just pull sample code from a zip file and work with a local server? I don't see any mention of a remote or cloud server. Link to comment Share on other sites More sharing options...
manu Posted February 15, 2016 Report Share Posted February 15, 2016 Mmmm nop. it explains how to pull code from an Amazon server. https://www.plasticscm.com/evaluation-guide/index.html and how to finally push your changes back. Link to comment Share on other sites More sharing options...
OPjp Posted February 15, 2016 Report Share Posted February 15, 2016 Ah, that's a different link. edit: I get an unexpected error when I try to replicate/pull as per the guide. Version 5.4.16.726 on mac. Log from console (I get 3 of them, nearly identical): 2/15/16 4:56:59.730 PM macplastic[4940]: Unable to simultaneously satisfy constraints: ( "<NSAutoresizingMaskLayoutConstraint:0x12ef6ef0 h=--& v=--& V:[w:0x26293df0(0)]>", "<NSLayoutConstraint:0x262da7b0 V:|-(115)-[NSScrollView:0x262d79e0] (Names: '|':w:0x26293df0 )>", "<NSLayoutConstraint:0x262da880 V:[NSButton:0x262d9320'Apply']-(0)-| (Names: '|':w:0x26293df0 )>", "<NSLayoutConstraint:0x262da7f0 V:[NSScrollView:0x262d79e0]-(10)-[NSButton:0x262d9320'Apply']>", "<NSLayoutConstraint:0x262da830 V:[NSButton:0x262d9320'Apply'(35)]>" ) Will attempt to recover by breaking constraint <NSLayoutConstraint:0x262da7f0 V:[NSScrollView:0x262d79e0]-(10)-[NSButton:0x262d9320'Apply']> Set the NSUserDefault NSConstraintBasedLayoutVisualizeMutuallyExclusiveConstraints to YES to have -[NSWindow visualizeConstraints:] automatically called when this happens. And/or, break on objc_exception_throw to catch this in the debugger. Link to comment Share on other sites More sharing options...
manu Posted February 16, 2016 Report Share Posted February 16, 2016 Ah, that's a different link. Ops! My fault! Link to comment Share on other sites More sharing options...
manu Posted February 16, 2016 Report Share Posted February 16, 2016 edit: I get an unexpected error when I try to replicate/pull as per the guide. Version 5.4.16.726 on mac. Log from console (I get 3 of them, nearly identical): 2/15/16 4:56:59.730 PM macplastic[4940]: Unable to simultaneously satisfy constraints: ( "<NSAutoresizingMaskLayoutConstraint:0x12ef6ef0 h=--& v=--& V:[w:0x26293df0(0)]>", "<NSLayoutConstraint:0x262da7b0 V:|-(115)-[NSScrollView:0x262d79e0] (Names: '|':w:0x26293df0 )>", "<NSLayoutConstraint:0x262da880 V:[NSButton:0x262d9320'Apply']-(0)-| (Names: '|':w:0x26293df0 )>", "<NSLayoutConstraint:0x262da7f0 V:[NSScrollView:0x262d79e0]-(10)-[NSButton:0x262d9320'Apply']>", "<NSLayoutConstraint:0x262da830 V:[NSButton:0x262d9320'Apply'(35)]>" ) Will attempt to recover by breaking constraint <NSLayoutConstraint:0x262da7f0 V:[NSScrollView:0x262d79e0]-(10)-[NSButton:0x262d9320'Apply']> Set the NSUserDefault NSConstraintBasedLayoutVisualizeMutuallyExclusiveConstraints to YES to have -[NSWindow visualizeConstraints:] automatically called when this happens. And/or, break on objc_exception_throw to catch this in the debugger. 1) Which MacOS version are you using? Just tested on El Capitan and seems to be working fine. 2) Is it failing when you click "Pull this branch" or when you later click "Replicate"? 3) Can you send us the "/Users/<Your_User>/.plastic4/macplastic.log.txt" log file? I think it will contain more info. Link to comment Share on other sites More sharing options...
OPjp Posted February 16, 2016 Report Share Posted February 16, 2016 1) Which MacOS version are you using? Just tested on El Capitan and seems to be working fine. 2) Is it failing when you click "Pull this branch" or when you later click "Replicate"? 3) Can you send us the "/Users/<Your_User>/.plastic4/macplastic.log.txt" log file? I think it will contain more info. Yosemite 10.10.3 When I click Replicate after filling out server/repo info. Here's a video: http://up.justinteractive.tv/uploaded/plasticError.mov log (I had enabled the debug flag): http://up.justinteractive.tv/uploaded/log.txt Link to comment Share on other sites More sharing options...
manu Posted February 16, 2016 Report Share Posted February 16, 2016 Not sure why it's failing in this ugly way. ERROR PlasticThread - Error when performing background operation: Only the server administrator can accept a certificate on the server. But we have a very similar issue fixed here: 5.4.16.729 If it doesn't how either with the new release I think the root cause seems to be you are not able to install the encryption certificate. Only the root Plastic SCM user is able to do it, so let's set yourself as root: 1) cm whoami 2) cm setowner -user=<TheWhoAmIAnswer> repserver:localhost:8087 3) Try again Link to comment Share on other sites More sharing options...
OPjp Posted February 16, 2016 Report Share Posted February 16, 2016 5.4.16.729 seems to be working after running those commands -- thanks for the help! Link to comment Share on other sites More sharing options...
manu Posted February 17, 2016 Report Share Posted February 17, 2016 Great! Link to comment Share on other sites More sharing options...
OPjp Posted April 8, 2016 Report Share Posted April 8, 2016 What's described here isn't really an ideal workflow. In case people stumble across this thread in the future, here's what I've found to work great: Instead of using the cloud server as the main server and pulling to a local server when you need to merge, just use the local server as the one you work in so you can merge freely with ease. Then, instead of doing replication>pull/push manually for each branch to sync with the cloud, like the guide suggests, set up a sync view and it's just a single button press to keep all branches synced. Maybe that's obvious to some people, but that doesn't seem to be what the advice and guides point new users towards. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.