binhex Posted September 20, 2012 Report Share Posted September 20, 2012 One of our developers is getting an error that simply states "A generic error occured in GDI+" (attached screenshot) when trying to merge. Any idea what would cause that? It only started happening recently. Link to comment Share on other sites More sharing options...
manu Posted September 21, 2012 Report Share Posted September 21, 2012 Hi binhex, can you please enable the stacktrace in order to get more info? To do that, please, edit the file located at: LOCAL_USER_FOLDER\AppData\Local\plastic4\client.conf and add the following entry at the near end of the file: <StackTrace>YES</StackTrace> Can you try the merge operation using the command line? "cm merge --help" Link to comment Share on other sites More sharing options...
marketware Posted October 1, 2012 Report Share Posted October 1, 2012 Here is the stack trace window. Link to comment Share on other sites More sharing options...
marketware Posted October 3, 2012 Report Share Posted October 3, 2012 Can anyone help with this topic? I haven't been able to Check-in for over three weeks... I have uninstalled and reinstalled with no success. Thanks to anyone who can help... bob Link to comment Share on other sites More sharing options...
manu Posted October 3, 2012 Report Share Posted October 3, 2012 HI bob, I need to take a look into the stacktrace and try to find out where the error comes from. As it's a graphical error you are still able to use the command line... "cm ci" will do the job. Link to comment Share on other sites More sharing options...
marketware Posted October 3, 2012 Report Share Posted October 3, 2012 I'm not sure how to use the command line options, I've only used the UI Link to comment Share on other sites More sharing options...
manu Posted October 4, 2012 Report Share Posted October 4, 2012 Here you have a fast list of the most useful commands: http://www.plasticscm.com/infocenter/quick-start/command-line-cheat-sheet.aspx Link to comment Share on other sites More sharing options...
marketware Posted October 4, 2012 Report Share Posted October 4, 2012 I've tried to merge on the command line...I have a merge that is in progress that must be completed before I CheckIN. The changeset that I need to merge (and can't because of the error above) is 135...I've tried the following syntax, but I keep getting an invalid specification (I've tried a number of variations with no success). cm merge /main/135 Ideas? I tried the -merge option, but I get an Unexpected option error... (yet this is in the documentation). bob Link to comment Share on other sites More sharing options...
manu Posted October 4, 2012 Report Share Posted October 4, 2012 ohh, is this command: cm merge cs:135 --merge and then cm ci Link to comment Share on other sites More sharing options...
marketware Posted October 4, 2012 Report Share Posted October 4, 2012 Attempted the Merge, and I got the same Error as given in the UI. Here is a copy of the command window and error again. www.marketware.com/files/stacktrace2.jpg Link to comment Share on other sites More sharing options...
marketware Posted October 4, 2012 Report Share Posted October 4, 2012 One more thought...I've been sync'ing for a couple of months now, so why all of a sudden am I getting this error? Link to comment Share on other sites More sharing options...
manu Posted October 5, 2012 Report Share Posted October 5, 2012 OK. It's an error in the merge tool application. (mergetool.exe) Try uninstalling Plastic SCM and installing it again, just to see if it's an error with your current binaries or it's an error with the revisions that the merge tool has to merge. You can also take a look into Beyond compare to avoid the issue: http://www.scootersoftware.com/ This is the line you have to use in order to get it configured with Plastic SCM. (Change the paths if yours are different) "c:\Program Files (x86)\Beyond Compare 3\BCompare.exe" /automerge /reviewconflicts /lefttitle="Source" /righttitle="Destination" /centertitle="Common Ancestor" /outputtitle="Output" /lro /rro /cro @sourcefile @destinationfile @basefile @output Link to comment Share on other sites More sharing options...
marketware Posted October 5, 2012 Report Share Posted October 5, 2012 Ahhhhhh, I found the problem. I had upgraded but when I ran the program it stated that I needed to "Upgrade" to the version on the server. This is confusing, because what it was actually doing was "Downgrading" me. When I looked in the \PLASTICSCM4 folder I noticed the dates where way back at the first of the year which wasn't right...so I tried the uninstall/reinstall again, and picked up that the server was on a previous version. Once I upgraded the server, then reinstalled, all is happy!!! Thank you for your help!!! bob Link to comment Share on other sites More sharing options...
manu Posted October 8, 2012 Report Share Posted October 8, 2012 You are welcome! Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.