Awesome

MergeVLDocs

Merging VL documents with traditional tools is hard. This tool is the first step towards an easy-to-use visual merge tool.

VL Documents

Merging patches shouldn't be harder, but easier to merge than textual code. Why?
A document is a tree of elements, where each element is identifiable via its Id (a GUID). So relating documents in different versions should be mostly about relating elements with the same Id.

Problem space

Merging is about taking the difference

• from Local to Base
• from Remote to Base
• combine these in a certain way

Let's distinguish different cases:

• Changes were made on different patches/canvases
• Changes were made in the same patch or the same canvas. But on different ends
• directly conflicting changes in the same patch/canvas: E.g.
  • a node was moved on Local and on Remote
  • The version of a dependency changed on Local and Remote ...
• structural changes: E.g
  • Dev A moved a bunch of definitions into a new Category or Group. Dev B changed one of those definitions.

First intuitions:

• different patches/canvases: Easy to be merged - syntactically. Also semantically you often should be lucky and the different ideas combine without trouble. Sometimes however ideas might collide: e.g. Anna changed an interface and all its implementations. Bob added an implementation of the old interface as known from Base. So we can have red nodes even after a merge without any conflicts.
• same patch/canvas, different ends: This should also be mergeable without further ado. But it's not likely that the different ideas will merge semantically and the result will just run.
• directly conflicting changes in the same patch/canvas: We have a conflict where the user would need to pick one version or the other. These conflicts sound like real bad, but then again: often those are about details, like moved nodes here and there. Often it's sufficient to have a strategy that just picks one and doesn't drag you into a timeconsuming decision process. What you want however is a notification that there were direct conflicts that got resolved in the one other way.
• structural changes: This is unmergeable for now since the only way to do those structural changes (via patch editor) is to copy and paste the definitions resulting in new GUID-Ids for all the elements. Note: this problem would go away if the document structure of VL files gets flattened (distinguish Canvas-Placement within another Canvas from the actual Canvas Definition, which should always be top-level)

First approach

Let's build a small application that gets called by git merge. Let's access the different versions (Base, Local, Remote) in the same way that p4merge and other merge tools do: via command-line arguments. In this first sketch, we load the three VL documents just as an XElement structure.

In this first naive implementation, we try to come up with a solution that covers most cases... So let's just work on an XElement and XAttribute level.

• Align XElements via their Id
• Merge their Attributes
• If one element got new child elements or attributes: take them
• If the other one also added new child elements: take them too! these should come with different GUIDs
• If some child elements or attributes got removed, then remove them (no matter if they got changed in the other version). Intuition for now: focus on the bold changes
• If a certain attribute got changed in both versions: Choose remote. Let the other dev win. In rare cases choose the Base value (e.g. "LanguageVersion" of the document). You get a warning and should check whether your patch still works. The idea behind remote: When opening the patches you will notice if something of your changes didn't make it. It's much harder to understand whether changes of somebody else made it through.

There are many things to discuss and to test. But it's a start. It's obvious that this approach can mess up the patches as much as a line-based merge tool. But at least certain kinds of errors can't occur.

• It should always be a valid document (even though with maybe many compile-time errors), but the integrity of each element should be preserved. Which is not guaranteed with line-based merges.
• We can tackle different elements in different ways. For now
  • LanguageVersion-Attribute in the Document
  • NodeReference-Element

Goals

After merging:

• show which parts were hard to merge and make it easy to navigate to those patches and inspect what happened.
• make it easy to do some fixes if the auto-magic merge failed.
• Have an installer that takes care of everything or even make it part of the official vvvv installer.

Setup

For now, it is manual.

• Download the latest release
• Unzip, make sure the name containing the exe is called just MergeVLDocs and move that folder under C:\Program Files or whereever you want it
• Go to your windows user folder (typically C:\Users\__MEMEMEME__) and edit the .gitconfig file. Consider making a copy of the original file before changing it.

  [merge]
    tool = MergeVLDocs

  [mergetool "MergeVLDocs"]
    cmd = \"C:/Program Files/MergeVLDocs/MergeVLDocs.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
    path = C:/Program Files/MergeVLDocs/MergeVLDocs.exe

make sure the path above is correct and the executable is at the correct location. Note that the path is made of slashes, not back-slashes. (Sorry for the inconvenience)

This configures our merge tool to be called regardless of the file type. The idea here is that our tool should do its job for VL-files, but call the previously configured tool in all other cases.

• For now: Install p4merge. This tool gets called by MergeVLDocs if it detects that it is not responsible for the file type in question.

Merge Tests

You can test the tool with your library or project VL docs, but that's not recommended for now. https://github.com/vvvv/MergeVLDocsExamples is here to exemplify merge problems and is here to test our tool.