>I'm using Mercurial with an online BitBucket repository. It's not automated inside VFP, but I've used it both for my own projects and for shared projects and found it works pretty well. I'm using Beyond Compare with Frank Perez's VFP add-in as the comparison tool. Because of that, I do NOT convert binaries to text before saving them to the repository.
>
>Oh, and if you want to go this way, get Rick Borup's papers on Mercurial from his website.
>
>Tamar

Hi Tamar:

I did take a look at Frank's add-in, and I see that generates something like this for a dataenvironment form:

[+Record]
[PLATFORM]WINDOWS
[UNIQUEID]_4UE16XWOR
[CLASS]dataenvironment
[BASECLASS]dataenvironment
[OBJNAME]Dataenvironment
[+PROPERTIES]
DataSource = .NULL.
Height = 0
Left = 0
Name = "Dataenvironment"
Top = 0
Width = 0

While FoxBin2Prg generates this code for the same dataenvironment form:

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've found that Frank's add-in generates almost the same text than the old Scctext(x) which I've used for many years, and who have many problems:

- Used tags (like [OBJNAME]) are not VFP code, which makes differences more difficult to see (you must digg between VFP code and rare tags)
- The tag [UNIQUEID] changes it's value if you take out a control and put another one, even if you name it identically, and changes in some other situations too
- This format is not optimized for a developer point of view, so you find yourself wasting some time looking into those tags to know which control's code you are in
- This format do not help for merging code, because you have not an easy way to see the differences (way a lot of differences to see and check!)
- Does not have good OLE support for using with SCM/SVCS tools (at least scctext did not export it, nor codifies it)

So, how can you merge code from a form or class modified in different branches or by different developers using the add-in?