Hi Rick!
I've downloaded the tryal of Beyond Compare 4, installed VFP2Text extension and made a simple form with 1 button on with a messagebox.
VFP2Text generates this output (I've copied just the dataenvironment part):
[+Record] [PLATFORM]WINDOWS [UNIQUEID]_4UE16XWOR [CLASS]dataenvironment [BASECLASS]dataenvironment [OBJNAME]Dataenvironment [+PROPERTIES] DataSource = .NULL. Height = 0 Left = 0 Name = "Dataenvironment" Top = 0 Width = 0
....now I understand WHY you say it's a pain in the neck to merge with it. This format is very similar of what SCCTEXT does! It's ilegible in many parts
Now this is the same extract with FoxBin2Prg (SC2 file edited with Beyond Compare 4 too):
DEFINE CLASS dataenvironment AS dataenvironment *< CLASSDATA: Baseclass="dataenvironment" Timestamp="" Scale="" Uniqueid="" ClassIcon="1" />
DataSource = .NULL. Height = 0 Left = 0 Name = "Dataenvironment" Top = 0 Width = 0
ENDDEFINE
...I think you should definetly take a look at FoxBin2Prg. It will make your team's (1 dev or more) life easier.
We use it in 2 teams with 8+ people each one, and a LOT of merging of VCX and SCX every day, without problems.
Well, just my sugestion.
Best Regards,
Fernando D. Bozzo.-
2017-02-07 20:54 GMT+01:00 Rick Schummer profox@whitelightcomputing.com:
Hi Fernando,
I rarely have to merge as we normally have one-developer one-project scenario at WLC. Always a pain in the neck to deal with on the rare occasions it pops up.
That said, the newest version of VFP2Text does support "two-way" if you save the files after you merge in Beyond Compare. Just like anything that you merge with the various binary source code files, you have to be smart to know what you can merge and how to merge. For instance, OLE controls are a pain. Moving methods that refer to a new property/method and not merging over the property/method details for the class definitely lead to problems.
The bi-directional feature has been in the tool since v2 so possibly you reviewed an earlier version.
Rick White Light Computing, Inc.
www.whitelightcomputing.com
-----Original Message----- From: ProfoxTech [mailto:profoxtech-bounces@leafe.com] On Behalf Of Fernando D. Bozzo Sent: Thursday, February 02, 2017 01:24 To: profoxtech@leafe.com Subject: RE: Diffing VCXs
Hi Rick:
I did take a look at Frank's converter, and it's not bidirectional, so you just can "view" converted files to text like Scctext does, but you can't merge them...
How did you use it in a source control development environment when you need to merge changes from different developers?
And using the class browser to generate PRG-like files doesn't allow to Regenerate the binaries from them, so it's a one-way conversion too.
El 2/2/2017 0:41, "Rick Schummer" profox@whitelightcomputing.com escribió:
Hi Paul,
If you have a license to Beyond Compare from Scooter Software, you can get an terrific add-on from Frank Perez that diffs not only VCXs, but any of the VFP source code DBFs and naturally PRGs too. No need to pick up SCCText or any other binary flattener for straight comparisons. It handles it for you.
http://pfsolutions-mi.com/Product/VFP2Text
Not sure I could do my job without this tool.
Rick White Light Computing, Inc.
www.whitelightcomputing.com
-----Original Message----- From: ProfoxTech [mailto:profoxtech-bounces@leafe.com] On Behalf Of Paul Newton Sent: Wednesday, February 01, 2017 09:07 To: profoxtech@leafe.com Subject: Diffing VCXs
Hi all
I came across this in response to a message posted by Dominic Burford
Hi Dominic,
you can find an even more sophisticated version of SCCTEXT.prg on the ProLib FTP archives:
ftp://ftp.prolib.de/public/vfp/mwscctext.prg
This is an adopted version from Markus Winhard (hence the "mw"), which has all the changes from Mark Wilden plus several other enhancements, like a much improved speed, a correct sorting of classes and methods, and more robust working.
However the FTP link does not work (it requires login credentials). However a bit of searching came up with
http://www.dfpug.de/Forum/catbody.afp?!_4U70VHTXU&nsec= 10&cname=mwscctext.zip
Unfortunately the Download button on that page will not allow me to save the zip file.
Any ideas/suggestions?
Paul
[excessive quoting removed by server]