Update test comment description (#7826)

Co-authored-by: Gregory Newman-Smith <gregory.newmansmith@couchbase.com>

Author: torcolvin

rest/replicatortest/replicator_test_legacy_rev_test.go

@@ -826,28 +826,31 @@ func TestActiveReplicatorConflictPreUpgradedVersionOneSide(t *testing.T) {
 		name                            string
 		activePeerHasPostUpgradeVersion bool
 	}{
-		// +-----------------+-------------------+----------------------------------------+-------------------+----------------------------------------+--+--+--+--+--+
-		// |                 | SGW1              |                                        | SGW2              |                                        |  |  |  |  |  |
-		// +-----------------+-------------------+----------------------------------------+-------------------+----------------------------------------+--+--+--+--+--+
-		// |                 | Rev Tree          | HLV                                    | Rev Tree          | HLV                                    |  |  |  |  |  |
-		// +-----------------+-------------------+----------------------------------------+-------------------+----------------------------------------+--+--+--+--+--+
-		// | Initial State   | 2-def,1-abc       | 100@SGW1                               | 2-abc,1-abc       | none                                   |  |  |  |  |  |
-		// +-----------------+-------------------+----------------------------------------+-------------------+----------------------------------------+--+--+--+--+--+
-		// | Expected Result | 3-abc,2-abc,1-abc | encodedFromRev3@Revision+Tree+Encoding | 3-abc,2-abc,1-abc | encodedFromRev3@Revision+Tree+Encoding |  |  |  |  |  |
-		// +-----------------+-------------------+----------------------------------------+-------------------+----------------------------------------+--+--+--+--+--+
+		// +-----------------+-------------------+--------------------------------------+-------------------+
+		// |                 | SGW1              |                  | SGW2              |                   |
+		// +-----------------+-------------------+------------------+-------------------+-------------------+
+		// |                 | Rev Tree          | HLV              | Rev Tree          | HLV               |
+		// +-----------------+-------------------+------------------+-------------------+-------------------+
+		// | Initial State   | 2-def,1-abc       | 100@SGW1         | 2-abc,1-abc       | none              |
+		// +-----------------+-------------------+------------------+-------------------+-------------------+
+		// | Expected Result | 3-abc,2-abc,1-abc | 3abc@RTE;100@SGW | 3-abc,2-abc,1-abc | 3abc@RTE;100@SGW1 |
+		// +-----------------+-------------------+--------------------------------------+-------------------+
 		{
 			name:                            "active peer has post upgrade version that wins",
 			activePeerHasPostUpgradeVersion: true,
 		},
-		// +-----------------+-------------+----------+-------------+----------+--+--+--+--+--+
-		// |                 | SGW1        |          | SGW2        |          |  |  |  |  |  |
-		// +-----------------+-------------+----------+-------------+----------+--+--+--+--+--+
-		// |                 | Rev Tree    | HLV      | Rev Tree    | HLV      |  |  |  |  |  |
-		// +-----------------+-------------+----------+-------------+----------+--+--+--+--+--+
-		// | Initial State   | 2-abc,1-abc | none     | 2-def,1-abc | 100@SGW2 |  |  |  |  |  |
-		// +-----------------+-------------+----------+-------------+----------+--+--+--+--+--+
-		// | Expected Result | 2-def,1-abc | 100@SGW2 | 2-def,1-abc | 100@SGW2 |  |  |  |  |  |
-		// +-----------------+-------------+----------+-------------+----------+--+--+--+--+--+
+		// The below test cases updates the document again on active peer to ensure we can push back to passive with
+		// no conflict after initial conflict resolution. Hence the expected result HLV contains active peer SGW1 as
+		// current version.
+		// +-----------------+-------------+-------------------------------+-------------+--------------------------------+
+		// |                 | SGW1        |                               | SGW2        |                                |
+		// +-----------------+-------------+-------------------------------+-------------+--------------------------------+
+		// |                 | Rev Tree    | HLV                           | Rev Tree    | HLV                            |
+		// +-----------------+-------------+-------------------------------+-------------+--------------------------------+
+		// | Initial State   | 2-abc,1-abc | none                          | 2-def,1-abc | 100@SGW2                       |
+		// +-----------------+-------------+-------------------------------+-------------+--------------------------------+
+		// | Expected Result | 2-def,1-abc | 1100@SGW1;2def@RTE,oldcas@SGW2| 2-def,1-abc | 1100@SGW1;2def@RTE,oldcas@SGW2 |
+		// +-----------------+-------------+-------------------------------+-------------+--------------------------------+
 		{
 			name:                            "passive peer has post upgrade version that wins",
 			activePeerHasPostUpgradeVersion: false,