Merge operation of Gerrit adds redundant code to the repository.

[nigang...@gmail.com]

Hi Guys:

We have got a merge problem. The merge operation of Gerrit adds some redundant codes to our repository.

It's odder that different Gerrit versions has differenct merge behaviors.  

Please help to figure out  what was happening.


The commit b78ec33007520f861967f9755409c3c8e6077f2e  had already merged into Gerrit .

commit b78ec33007520f861967f9755409c3c8e6077f2e
Date:   Fri Jun 23 19:58:14 2017 +0800

    Add E7B support.
   
    Change-Id: I028657e5bba89ac4d6c025fc76a7e8d63c4fe6f7

diff --git a/boot_images/core/boot/secboot3/hw/msm8952/sbl1/sbl1_mc.c b/boot_images/core/boot/secboot3/hw/msm8952/sbl1/sbl1_mc.c
index 8c7ac55..9e1f656 100755
--- a/boot_images/core/boot/secboot3/hw/msm8952/sbl1/sbl1_mc.c
+++ b/boot_images/core/boot/secboot3/hw/msm8952/sbl1/sbl1_mc.c
@@ -200,6 +200,12 @@ HDEVICE_PCBA PCBA_DETECT_E7A[]={
                                        {295,PCBA_E7A_GLOBAL}
                 };
 
+HDEVICE_PCBA PCBA_DETECT_E7B[]={
+                                       {900,PCBA_E7B_CN},
+                                       {409,PCBA_E7B_IN},
+                                       {295,PCBA_E7B_GLOBAL}
+                };
+
 HDEVICE_PCBA *PCBA_DETECT=NULL;
 

There is another change which contains the modificaiton in the commit above . 
The two commits have the same parent.

commit 63c5f784c327dda4ab11952c5078c0e445339bd9
Date:   Fri Jul 14 16:46:20 2017 +0800

    Modify HW-ID name for new Project.
   
    Change-Id: I16443302e6d9a2f5f578e9a93efff0617a2bbc5e

diff --git a/boot_images/core/boot/secboot3/hw/msm8952/sbl1/sbl1_mc.c b/boot_images/core/boot/secboot3/hw/msm8952/sbl1/sbl1_mc.c
index 8c7ac55..fe7b9e4 100755
--- a/boot_images/core/boot/secboot3/hw/msm8952/sbl1/sbl1_mc.c
+++ b/boot_images/core/boot/secboot3/hw/msm8952/sbl1/sbl1_mc.c
@@ -184,8 +184,10 @@ HDEVICE_PCBA PCBA_DETECT_D2[]={
                            {48,PCBA_P1},
                            {190,PCBA_D2_MP1_CN},
                             {295,PCBA_D2_MP1_GLOBAL},
-                            {409,PCBA_D2_MP1_IN}
-
+                            {409,PCBA_D2_MP1_IN},
+                           {507,PCBA_D2_MP2_CN},
+                            {623,PCBA_D2_MP2_GLOBAL},
+                            {707,PCBA_D2_MP2_IN}
                          };
 
 HDEVICE_PCBA PCBA_DETECT_C6A[]={
@@ -200,6 +202,12 @@ HDEVICE_PCBA PCBA_DETECT_E7A[]={
                                        {295,PCBA_E7A_GLOBAL}
                 };
 
+HDEVICE_PCBA PCBA_DETECT_E7B[]={
+                                       {900,PCBA_E7B_CN},
+                                       {409,PCBA_E7B_IN},
+                                       {295,PCBA_E7B_GLOBAL}
+                };
+
 HDEVICE_PCBA *PCBA_DETECT=NULL;

We did  the code review and verify +1/review +2.  Then submit the new change to Gerrit.
The Gerrit server did a merge on the repository.

Gerrit which we downloaded from https://gerrit-releases.storage.googleapis.com/index.html.
including the following versions:
v 2.12.2
v 2.12.3
v 2.14
v 2.14.1
v 2.14.2


The merged commits add redundant codes

commit 56f252cb3d09c5151885280571205382cca75c2b
Merge: b78ec33 63c5f78
Date:   Fri Aug 4 11:02:17 2017 +0800

    Merge "Modify HW-ID name for new Project." into kaka

diff --cc boot_images/core/boot/secboot3/hw/msm8952/sbl1/sbl1_mc.c
index 9e1f656,fe7b9e4..373b957
--- a/boot_images/core/boot/secboot3/hw/msm8952/sbl1/sbl1_mc.c
+++ b/boot_images/core/boot/secboot3/hw/msm8952/sbl1/sbl1_mc.c
@@@ -205,6 -207,6 +207,12 @@@ HDEVICE_PCBA PCBA_DETECT_E7B[]=
                                        {409,PCBA_E7B_IN},
                                        {295,PCBA_E7B_GLOBAL}
                  };
++
++HDEVICE_PCBA PCBA_DETECT_E7B[]={
++                                      {900,PCBA_E7B_CN},
++                                      {409,PCBA_E7B_IN},
++                                      {295,PCBA_E7B_GLOBAL}
++                };
 
  HDEVICE_PCBA *PCBA_DETECT=NULL;

The Gerrit which download from CI build 
https://gerrit-ci.gerritforge.com/view/Gerrit/job/Gerrit-bazel-master/1790

The Gerrit wich built from source code locally  seems works well .

commit d71c271f2105e2be98c470c75e089edc332f7650
Merge: b78ec33 63c5f78
Date:   Fri Aug 4 10:50:38 2017 +0800

    Merge "Modify HW-ID name for new Project." into kaka