cherry pick command issue

yogita.jagdale

Hi,
 
After doing cherry-pick we have faced the issue where xxxx vanilla fix was not applied at correct place in BNETS source code.
 
Please find attached screenshot of source code which went wrong after cherry-pick.
 
From line number 13501y00 to 13501y00 fix should get applied after 13501u0A. But it got applied after the CSM line due to which transaction processing got impacted in production and as compared with parameter table and case condition it got misplaced.
 
For your reference please find attached source file of BNETS. Kindly check line number 12676y00, 13501u0A and 13501y00.

snap1:

 

rsbeckerca

In the past month, we have experienced a similar line move in one file in our own code. This appears to have happened during the MERGE SQUASH function when a PULL REQUEST was merged. The code was fine in the topic branch created by Jira but after the squash, the first line of one merge block was incorrectly located. Sadly, the branch is gone and we cannot see the commit log from that branch. The file has 6700 lines and the problem occurred in the middle. We did not notice because the line that was moved was effectively a no-op, otherwise it would have shown up in regression testing. The situation occurred 17 Nov 2020 and went unnoticed until today. Note that we cannot prove 100% that this was not a developer issue rather than a BitBucket issue. We find the timeframe (that it occurred near when the OP encountered this) to be interesting. What version of git was being used at BitBucket Cloud at that time? For the OP, what version of git was on your BitBucket install at that time?