kevinj Posted May 1, 2013 Report Share Posted May 1, 2013 I have a branch at the 'base' of my repository, call it dev. Off dev I create a child branch. I've made changes to dev and to the child, however. When I try and merge from dev to the child I get this in the client: Changed only on source, automatic merge (2 items) Item 1 (It's a DLL) Item 2 (text file) Moved, automatic merge (1 items) A dll Nothing I do can convince plastic to go any further. If I create a new child from dev, I can merge *to* that from the original child, but merging back from the new child to the original child gives me the same issues. I'm assuming that I can't ignore this (or can I). Is there a way out of or around this? Thanks Link to comment Share on other sites More sharing options...
EdDev Posted May 1, 2013 Report Share Posted May 1, 2013 It's not clear to me where you get stuck... Do you mean that pressing the "Process merge" button does nothing? Link to comment Share on other sites More sharing options...
kevinj Posted May 2, 2013 Author Report Share Posted May 2, 2013 Yes, once I get to this point I can no longer continue the merge, it constantly returns to this screen Link to comment Share on other sites More sharing options...
EdDev Posted May 3, 2013 Report Share Posted May 3, 2013 I had this problem on a Linux machine, and I found out it was a problem with the 3 way merge tool. Are you working on Linux? Have you changed your diff/merge tool? (under preferences) Link to comment Share on other sites More sharing options...
manu Posted May 6, 2013 Report Share Posted May 6, 2013 Hi Kevin, I'll be happy to get connected to you in order to find if there's any issue with your merge. Link to comment Share on other sites More sharing options...
fehaar Posted October 2, 2013 Report Share Posted October 2, 2013 I have a similar issue. I have merged from one branch to another and most of my merges were completed. Both Automatic and manual. But after processing the merge the Windows still shows four items that needs merging. Three that are changed only on source and one that is deleted on source. Pressing the "Process all merges" button does nothing. I cannot commit because a merge is in Progress. I have tried resetting the merge and doing it Again. Same result. Is there anywhere on the command line or in the tool where I can do a force or something similar so I can proceed? Or what options do I have from here? I am running on Windows using semantic merge. Plastic version 4.1.10.477. Link to comment Share on other sites More sharing options...
manu Posted October 3, 2013 Report Share Posted October 3, 2013 Hello Fehaar, can you please repeat the merge usign the command line? The command should be something like: cm merge br:/main/xxxx --merge --verbose Post us the result. Additionally can you please try to repeat the merge from the GUI but using a different workspace? I want to try to find out where the issue is coming from. Regards! Link to comment Share on other sites More sharing options...
PJR3456 Posted October 3, 2013 Report Share Posted October 3, 2013 I am also having the same problem. The merge view shows I have 15 items to merge, but pressing the "Process all merges" button does not merge them. I have also attached a screenshot of the merge view screen. Plastic SCM: Version 4.1.10.464 Semantic merge: Version 0.0.39.0 Link to comment Share on other sites More sharing options...
manu Posted October 3, 2013 Report Share Posted October 3, 2013 Hi, can you please issue the command I posted before? Link to comment Share on other sites More sharing options...
PJR3456 Posted October 3, 2013 Report Share Posted October 3, 2013 I have solved my problem. It was caused by the files in question having very large pathnames. Once I deleted these files the merge completed successfully. Link to comment Share on other sites More sharing options...
manu Posted October 3, 2013 Report Share Posted October 3, 2013 Cool! Let's see if fehaar can give us ore info about his issue. Link to comment Share on other sites More sharing options...
fehaar Posted November 15, 2013 Report Share Posted November 15, 2013 Sorry! I totally forgot about this thread as I got my problem resolved. One of my collegaues did the merge with no problems - he had a different version of Plastic. I haven't run into the issue again until just now in a different merge. This time I have tried the command line and I ended up with the same issues. But along the way I got a popup that I didn't get when merging through the GUI. It says: "The file have too many differences, there aren't enough resources to complete the operation.". I looked at the merge in the GUI and resolved the file that had that issue but now I am still stuck with three files that says they merge automatically but cannot be processed. It is one moved, one changed on source and one deleted on source. Link to comment Share on other sites More sharing options...
fehaar Posted November 15, 2013 Report Share Posted November 15, 2013 Update to this issue. I tried it in a different workspace. Same merge. No issues. Resolves my problem - but it is still not very comforting... Link to comment Share on other sites More sharing options...
manu Posted November 15, 2013 Report Share Posted November 15, 2013 Hi fehaar, can you please check if the thing with big files names if affecting the first workspace? If you still have the change to reproduce the issue you can try the operation using the command line as I proposed up there, the verbose option will give us more info. Enabling the client and server log will also help to identify if the fist workspace is having any issue. Link to comment Share on other sites More sharing options...
fehaar Posted November 15, 2013 Report Share Posted November 15, 2013 I have tried the command line. Same result. No apparent errors in the console logs. None of the problematic files have fantastically long path names. It seems like my workspace is in a lot of trouble. After making the merge on the secondary workspace I tried to update to that new changeset and it failed miserably giving me all sorts of assertion errors and other goodies. It looks like I have to abandon that workspace entirely. Link to comment Share on other sites More sharing options...
manu Posted November 15, 2013 Report Share Posted November 15, 2013 For that workspace. Close the GUI, remove all the files at the weirdWks\.plastic except the plastic.workspace and plastic.selector. Open the GUI, run an update and try the merge again. Link to comment Share on other sites More sharing options...
fehaar Posted November 15, 2013 Report Share Posted November 15, 2013 Closed GUI. Deleted the files. Reopend gui. In the bar it says that I am at changeset 1921. The branch Explorer shows me at changeset 0. Is that supposed to happen? I will swtich to the changeset where I had problems last and retry the merge. Link to comment Share on other sites More sharing options...
manu Posted November 15, 2013 Report Share Posted November 15, 2013 Yes, you are missing the update operation that will update you to that cset. Link to comment Share on other sites More sharing options...
fehaar Posted November 15, 2013 Report Share Posted November 15, 2013 All right. That was what I figured. Tried the same merge again. No problems. What can clutter up the workspace so bad so I get into these kinds of situations? Link to comment Share on other sites More sharing options...
manu Posted November 15, 2013 Report Share Posted November 15, 2013 I'm afraid that without the log file I'm not able to figure out was going on :S Link to comment Share on other sites More sharing options...
fehaar Posted November 15, 2013 Report Share Posted November 15, 2013 How do I get the log file? For next time.... I guees it is too late now after the revert? Link to comment Share on other sites More sharing options...
manu Posted November 15, 2013 Report Share Posted November 15, 2013 You can send us to support the server log (plastic.server.log) just to see if we can get something but the client is not having the log enabled by default... Here you can learn how to enable it: http://www.plasticscm.com/infocenter/technical-articles/kb-enabling-logging-for-plastic-scm-part-i.aspx Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.