Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

cherry pick command issue

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:

snap1.pngsnap2.png
 

1 answer

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?

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

Powering DevOps with Bitbucket Server & Data Center

Hi everyone, The Cloud team recently announced 12 new DevOps features that help developers ship better code, faster   ! While we’re all excited about the new improvements to Bitbucket ...

2,581 views 1 9
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you