There aren't any merge tools defined?

[crjenkins]

I've been merging fine until recently I get this message on macplastic: "There aren't any merge tools defined in the client configuration file." I haven't touched the merge settings in the preferences. What should I do?

[manu]

Hi, that's weird, the configuration is stored inside the client.conf file.

 

The file is located at the "$HOME/.plastic4" directory, can you check if you have a backup file?

 

Do you remember if you did something special before the merge tool config disappeared?

[crjenkins]

Hi, that's weird, the configuration is stored inside the client.conf file.

 

The file is located at the "$HOME/.plastic4" directory, can you check if you have a backup file?

 

Do you remember if you did something special before the merge tool config disappeared?

 

Here's the file in that directory:

<?xml version="1.0" encoding="utf-8"?>
<ClientConfigData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <Language>en</Language>
  <WorkspaceServer>##HIDDEN FOR THIS POST##</WorkspaceServer>
  <WorkingMode>UPWorkingMode</WorkingMode>
  <SecurityConfig>##HIDDEN FOR THIS POST##</SecurityConfig>
  <SetFilesAsReadOnly>no</SetFilesAsReadOnly>
  <SetRevisionFileDate>no</SetRevisionFileDate>
  <SupportSmbWorkspaces>no</SupportSmbWorkspaces>
  <PerformAddPlusCi>no</PerformAddPlusCi>
  <CheckFileContentForChanged>no</CheckFileContentForChanged>
  <CaseSensitiveFsOnMac>no</CaseSensitiveFsOnMac>
  <SameItemDifferentCaseError>no</SameItemDifferentCaseError>
  <CheckinQueuesSize>50</CheckinQueuesSize>
  <DownloadPoolSize>1</DownloadPoolSize>
  <UploadCompressionSize>1</UploadCompressionSize>
  <PendingChangesOnSwitchAction>Fail</PendingChangesOnSwitchAction>
</ClientConfigData>

I don't believe I would have a backup, unless it's already generated for me?

 

All I can remember is that I was trying to merge a branch into the main and it was telling me that I failed. I think I tried to undo the changes to the changeset and try again, then got this error. I'm not very sure.

[manu]

I'm sorry but I still don't know how they could disappear. 

 

You'll need to reconfigure them, I'm really sorry.

 

I'll monitor it just in case I discover how this can happen.

[crjenkins]

I'm sorry but I still don't know how they could disappear. 

 

You'll need to reconfigure them, I'm really sorry.

 

I'll monitor it just in case I discover how this can happen.

 

Oh, ok. How do I reconfigure the the default merge tool on (Macplastic 5.4.16.693 UFO Rock Bottom)? It's working on my second computer (also mac) but, now it's missing the Diff tool (same error but instead of merge it's diff). I suppose I'd need to reconfigure it too.

[manu]

Hi!

 

I'm sorry but what do you mean by defailt merge tool? Macplastic is not having diff/mergetools yet (we are currently working on it) so which mergetool have you been using?

 

BTW, you can configure external merge and diff tools inside the macplastic preferences. PlasticSCM - > Preferences.

 

 

[Hexodus]

On 30.9.2015 at 10:49 AM, manu said:

I'm sorry but what do you mean by defailt merge tool? Macplastic is not having diff/mergetools yet (we are currently working on it) so which mergetool have you been using?

 

I have the same Problem. Are there still no diff-tools intergrated on Mac? What else can I use then and how?