Skip to main content
Version: 7.0

Version Control: Differences

Merging differences between branches is not recommended, as it might result in invalid XML files that can not be imported to the Automation Engine anymore. To help merging manually this modules provides a report showing off the differences between two branches or tags.

Designation​

Name
vcs.Diff
Aliases
GitDiff, pm.PackageDiff

Configuration​

1. Source Type (source1-type)
Specifies if the 1. source is a branch or tagMögliche Werte: Branch (branch), Tag (tag)
1. Source Name (source1-name)
Defines the name of the 1. source, which is a branch name or a tag
2. Source Type (source2-type)
Specifies if the 2. source is a branch, tag or b4A connectionMögliche Werte: Branch (branch), Tag (tag), Working Copy (working-copy)
2. Source Name (source2-name)
Defines the name of the 2. source, which is a branch name or a tag
2. b4A connection (source2-connection)
Defines the b4A connection that serves as the second source in the case of the working copy source typeMögliche Werte: <TabItem b4A Verbindungen>
Object for structured documentation (structured-docu)
If given the information are stored in the structured documentation of the object
Connection (structured-docu-connection)
if given the object for the structured documentation is used in the given connectionMögliche Werte: <TabItem b4A Verbindungen>
Name of structured documentation (structured-docu-name)
Defines the name of the tab of the structured documentation that should be used. If empty the first one is chosen.
empty structured documentation first (structured-docu-reset)
if set the structured documentation of the object is emptied first

Output format XML-Vatriable​

The report on a comparison looks like the XML document in the following example.

<?xml version="1.0" encoding="UTF-8"?>
<best4Automic>
    <vcs>
        <difference package="TESU.B4A_VCS">
            <source name="4.5" type="branch"/>
            <destination name="4.5" type="working-copy"/>
            <status>
                <added number="2"/>
                <removed number="0"/>
                <changed number="1"/>
            </status>
            <details>
                <added>
                    <item name="TEST_SUITE/TESU.B4A_VCS/CONFIG/TESU.B4A_VCS.VARA@XML.DIFF.VARA"/>
                    <item name="TEST_SUITE/TESU.B4A_VCS/SOURCE/TESU.B4A_VCS.SCRI.PUSH_TEST3.SCRI"/>
                </added>
                <removed/>
                <changed>
                    <item name="TEST_SUITE/TESU.B4A_VCS/SOURCE/TESU.B4A_VCS.SCRI.PUSH_TEST2.SCRI">diff --git a/TEST_SUITE/TESU.B4A_VCS/SOURCE/TESU.B4A_VCS.SCRI.PUSH_TEST2.SCRI b/TEST_SUITE/TESU.B4A_VCS/SOURCE/TESU.B4A_VCS.SCRI.PUSH_TEST2.SCRI
index 419ab12..a530988 100644
--- a/TEST_SUITE/TESU.B4A_VCS/SOURCE/TESU.B4A_VCS.SCRI.PUSH_TEST2.SCRI
+++ b/TEST_SUITE/TESU.B4A_VCS/SOURCE/TESU.B4A_VCS.SCRI.PUSH_TEST2.SCRI
@@ -86,7 +86,8 @@
    &lt;/ROLLBACK&gt;
    &lt;SCRIPT mode="1" state="1"&gt;
        &lt;MSCRI&gt;
- &lt;![CDATA[:p "hello world"]]&gt;
+ &lt;![CDATA[:p "hello world"
+:p "hello world"]]&gt;
        &lt;/MSCRI&gt;
    &lt;/SCRIPT&gt;
    &lt;DOCU_Docu state="1" type="text"&gt;
</item>
                </changed>
            </details>
        </difference>
    </vcs>
</best4Automic>

The document contains four blocks of information

  • source: The original for the comparison
  • destination: The modified version to be compared with the original
  • status: Summary of the changed, added and deleted objects
  • details: Details of the changes to the individual objects

Example XPath to read the number of added objects

/best4Automic/vcs/difference/status/added/number