What is the difference between P4V's Branch, Copy, Integrate/Merge

perforce p4v
lionel319 picture lionel319 · Aug 13, 2012 · Viewed 23.1k times · Source

I am using P4v, and when i bring up the context-menu on a folder, i have these options:- - Integrate/Merge - Copy - Branch

Seems to me like they are all doing the same thing. Is there any real difference in these commands?

thanks.

Answer

user1054341 picture user1054341 · Aug 13, 2012

When you integrate or merge, you blend files together. That is, you end up having to resolve files that have overlapping changes. 'p4 merge' and 'p4 integrate' do this.

When you copy, you replace files -- no overlapping changes are resolved. 'p4 copy' does this.

When you branch, you copy files to a location where no files existed before. 'p4 populate' does this.

What P4V does depends on the version of P4V you have. You can look in the log pane to see the p4 commands it's running. (Use 'Preview' to get it to run those commands with -n.)

Related questions

How to delete a workspace in Perforce (using p4v)?

I'm new to Perforce and have created a few workspaces as exercises for getting familiar with it. Now I would like to delete some of the workspaces. I just want to get rid of the workspaces so that they do …

Read More
What is the difference between "Rollback..." and "Back Out Submitted Changelist #####" in Perforce P4V

I want to reverse the changes from one of my checkins. In the right-click context menu of the particular changelist, there are these two options: Rollback... Back Out Submitted Changelist What is the difference between these two? In what situations …

Read More
How do I display a particular changelist number in p4v?

When viewing submitted changelists in p4v, is there a way to display a particular changelist number? That is, how I do the equivalent of p4 describe in p4v? Can I filter for a particular changelist number? I don't …

Read More