mengl Posted October 17, 2014 Report Share Posted October 17, 2014 Hi, get the following error msg during merging from one branch to the main branch: plastic.server log says the following:2014-10-17 09:22:53,085 00000000-0000-0000-0000-000000000000 NT-AUTORITÄT\SYSTEM at WSW8ENM INFO Operations - Get info for branch /main at repository ID 17052014-10-17 09:22:53,132 NT-AUTORITÄT\SYSTEM at INFO ChannelCall - recb: 546|rect: 0|sentb: 592|sendt: 0|prt: 47|th: 24|dest: 0|mt: 47|sert: 0|zip: 0| 192.168.220.21|GetBranchInfoByName2014-10-17 09:22:54,754 00000000-0000-0000-0000-000000000000 NT-AUTORITÄT\SYSTEM at WSW8ENM ERROR Operations - Plastic server version: 5.0.44.5372014-10-17 09:22:54,754 00000000-0000-0000-0000-000000000000 NT-AUTORITÄT\SYSTEM at WSW8ENM ERROR Operations - OnError catching exception Memory stream is not expandable.2014-10-17 09:22:54,754 NT-AUTORITÄT\SYSTEM at ERROR Codice.CM.Server.ExceptionTracerSink - Dumping in-transit exception:There has been an unexpected error "Memory stream is not expandable.". For more information check the server log.2014-10-17 09:22:54,770 NT-AUTORITÄT\SYSTEM at INFO ChannelCall - recb: 1189|rect: 0|sentb: 1640|sendt: 0|prt: 1607|th: 39|dest: 0|mt: 1607|sert: 0|zip: 0| 192.168.220.21|GetObjectsData2014-10-17 09:23:04,301 (null) NT-AUTORITÄT\SYSTEM at (null) INFO Channel - Tcp transport error. ReceiveMessageStatus Connection closedI have no idea what to do next.Please help me as soon as possible! Because this branch needs to be merged immediatly since it contains critical changes for our new version. Link to comment Share on other sites More sharing options...
manu Posted October 17, 2014 Report Share Posted October 17, 2014 Hello, can you try the cherry-pick operation? If you merge the main branch into the task branch fails in the same way? Link to comment Share on other sites More sharing options...
mengl Posted October 17, 2014 Author Report Share Posted October 17, 2014 I did a workaround in the meantime. I did all changes to the main branch without merging to get the feature into the main branch. I just tried to cherry-pick the changes from the branch change-set to merge them into the main branch change-set. But I get the same error. Merging the main branch into the feature branch does not work either since there wasn't a change in the main branch so far. that means no merge necessary, if you know what I mean. I guess the reason for this issue is that I need to merge some external libraries in binary format. My feature branch contains several external libraries in binary format. I did a restructuring of our folder structure and moved these libraries into a new location. It seems that this moving has something to do with this certain error message. Btw. the libraries folder contains around 155 MB of binary data. Any ways my workaround was successful - so thanks for your help! Link to comment Share on other sites More sharing options...
manu Posted October 20, 2014 Report Share Posted October 20, 2014 Thanks for the extra info. If you contact directly to support (support at codicesoftware dot com) I can spend some time trying to understand the error, I think the binaries are not going to be the problem since all the merge operations are done at the client side. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.