Jump to content


Feature branching in Helix

helix feature-branches

  • Please log in to reply
2 replies to this topic

#1 Max Pavlov

Max Pavlov

    Advanced Member

  • Members
  • PipPipPip
  • 59 posts

Posted 15 April 2015 - 08:40 AM

Hello.

We are to upgrade P4D to 2015.1 this weekend.

We see that Git like-like workflow management is advertised as a new feature.

My question is - with P4D 2015.1, will we be able to create feature branches git-like, or does Perforce Helix still provides streams as feature branching mechanism?

Please point me to a documentation if that is a more efficient form of answering my question but a simple yes no would be also nice.

Thanks!

#2 P4Sam

P4Sam

    Advanced Member

  • Members
  • PipPipPip
  • 484 posts
  • LocationSan Francisco, CA

Posted 15 April 2015 - 04:53 PM

Yes to both questions.  With 2015.1 you can clone a new local repository from your shared repository's mainline:

p4 clone -p perforce:1666 -f //depot/main/...

then create a feature branch (stream) on your local repository with one command:

p4 switch -c featureA

do some work in that stream, then switch back to main, fetch the latest changes from the shared repository, and merge in your feature:

p4 switch main
p4 fetch
p4 merge --from featureA
p4 submit

and then push it back:

p4 push

By default fetch/push simply maps your local "main" stream to whatever path/branch/stream you cloned from, but you can add mappings for other paths with the "p4 remote" command (you can map the entire repository if you want), so you decide which work is private to your local repository and which you'll share.

See the Perforce DVCS user guide for more info and examples.

#3 Max Pavlov

Max Pavlov

    Advanced Member

  • Members
  • PipPipPip
  • 59 posts

Posted 16 April 2015 - 08:31 AM

@P4Sam - thank you very much!





Also tagged with one or more of these keywords: helix, feature-branches

0 user(s) are reading this topic

0 members, 0 guests, 0 anonymous users