Feedback [BUG] Invalid command line using Collaborate and WinMerge

Unity 2019.1 and earlier Vr of U. Windows 10

Issue:
When calling WinMerge using Unity Collab button to compare a file,
the default 3rd File or Folder Option is invalid. The 3rd field contains "U:\e".
And is difficult for a beginner to understand why the Compare button is not working since is deactivated as shown in this screen-shoot



Solution:
In the input field take out "U:\e" and live it empty. The button will return visibly.

Bug:
As shown in the attached file, the command line option for starting WinMerge from Unity is invalid. (For example, \e must be /e or -e


Looks like is missing an open "

I have done a bug report. As soon I get a tracking number, I will pas it here.

 

Hi @ryanc-unity, how 'actively' is actively? This problem is still present when using Winmerge with Unity 2018.3.7f1.

The issue you link to now states: "Due to the age of this issue, and since YAMLMerge is in the process of being replaced by a newly revamped merging system, our team has decided to close this issue as Won't Fix."

Do you have any ETA on replacing YAMLMerge?

Thanks,
Matt

 

A while back, I also reported this bug, but they insisted WinMerge should be fixed instead.

 

That seems a bit harsh. I am assuming here, but: WinMerge defines its command-line parameters format, Collaborate does not respect this format, WinMerge has to be fixed?

What say you, Unity?

 

I report this bug to WinMerge first as an issue. They make an investigation and they answer negative (that is a Unity side bug).

 

Won't Fix by design. @ryanc-unity Can you make a workaround for this particular issue?
For example when WinMerge is selected in Preferences External tools then the output does include a space instead of "U:\e".

 

Thanks for the update, Ryan! I actually went back to WinMerge 2.14.0.0, which does not yet have a third file option. This works fiine for looking at the diff, but you cannot save any changes you make to your local file, because it then reports that 'c:\e' is not valid. And now I know WHY

 

As I mention at the top, to use latest WinMerge you (user) need to just remove "U:\e" from the input field. At that point, the button will return visibly!

Solution:
In the input field take out "U:\e" and live it empty. The button will return visibly.

 

A good workaround would be to setup the command line yourself using the "Custom Tool" selection in the Revision control diff/merge dropdown, but I can't for the life of me find any documentation as to what macros to use to make this work.



I've tried $1 %1 %left% etc. I'm still guessing to figure it out. Anyone know?

 

Found my answer here: https://docs.unity3d.com/2020.1/Documentation/Manual/Preferences.html

I overlooked it before. There's a nice table:
To specify file layout in the revision tool, use these arguments:


Property Function
#LTITLE Left title
#RTITLE Right title
#ATITLE Ancestor title
#LEFT Left file
#RIGHT Right file
#ANCESTOR Ancestor file
#OUTPUT Output file
#ABSLEFT Absolute path to the left file
#ABSRIGHT Absolute path to the right file
#ABSANCESTOR Absolute path to the ancestor file
#ABSOUTPUT Absolute path to the output file

 

In case this is useful, here are the WinMerge (V2.6.10.0 x64) two-way diff command line args I'm using:

/e /u /wl /dl #LTITLE /dr #RTITLE #LEFT #RIGHT

​

/e - Allow escape to close editor

/u - Don't add files to the most recently used list in WinMerge

/wl - The left file is read-only

/dl - Left title

/dr - Right title

 

Dude, thank you for that. Getting two programs to play nicely is always so much easier with an example. Cheers

 

Is this bug fixed?
I'm just double-checking for quality control