All geek questions in one place

Git equivalent of cherry in Perforce?

My team uses perforce for version control. There were a lot of add-ons in the branch that I'm working on now, compared to the Release division.
Now I just installed a known bug in the released product and checked for code changes in the branch I was working on. Is it possible to check only one single change in the same change using the release branch?

Alternatively, I just want to check out this bug fix in the release branch, and not any other code changes. From what I was searching on the Internet, I realized that the git equivalent for this is git cherry pick. Is there a way to do this in Perforce?

+6
source share
2 answers

Yes it is possible. However, for any reason, official instructions have been rescheduled or deleted. Maybe there are other better alternatives. I dont know. It has been many years since I last used P4, so this is not based on personal experience, and the proposal below is what the official response forum suggested

echo Change A > foo p4 add foo p4 submit -d "Add foo" foo p4 integ foo bar p4 submit -d "Branch foo" bar p4 edit foo echo Change B >> foo p4 submit -d "Update foo" foo p4 edit foo echo Change C >> foo p4 submit -d "Update foo again" foo p4 integ foo#3,#3 bar p4 resolve -o

The link below is stored if someone wants to try to find the source page using archive.org or a similar service.

Official cherry-picking instructions.

+6
source

Here's an article in KB that talks about picking cherries. https://community.perforce.com/s/article/3385

0
source

Source: https://habr.com/ru/post/944434/

More articles:


All Articles