Jump to content


Merging Selective ChangeLists to another branch

Changelists Merge Integrate

  • Please log in to reply
2 replies to this topic

#1 Harsh

Harsh

    Newbie

  • Members
  • Pip
  • 1 posts

Posted 28 June 2013 - 11:55 AM

I have two branches X & Y
Revisions have been made to both the branches. From Branch X i want to take (only) the chenges done as part of Revision 3 and merge it to the latest revision of branch Y
(Refer to the Attachment which shows the revision graph)
But i do not want changes from Branch X Revision 2 to be merged.

I can do this by doing a diff and then copying and pasting, but is their a more trendier way to handle situations like this.

Regards,
Harsh

#2 P4Matt

P4Matt

    Advanced Member

  • Members
  • PipPipPip
  • 1383 posts

Posted 28 June 2013 - 05:03 PM

You can use Perforce integrate to cherry pick just the revision you want. You can do this by specifying a changelist in the options section of the integrate dialog. The attached screenshot will shows the options you will want to set. It's a bit odd, but you just need to specify the revision you want in both fields and it should integrate only those deltas.

Screen Shot 2013-06-28 at 8.57.57 AM.png

#3 P4GabeW

P4GabeW

    Advanced Member

  • Members
  • PipPipPip
  • 62 posts

Posted 28 June 2013 - 10:14 PM

There's an option in the dropdown in Matt's screenshot that says "Revisions equal to" where you can enter revision 3 and it will do the same thing too.





0 user(s) are reading this topic

0 members, 0 guests, 0 anonymous users