[p4] Feature branching in Helix

P4Sam perforce-user-forum at forums.perforce.com
Wed Apr 15 09:55:01 PDT 2015


Posted on behalf of forum user 'P4Sam'.

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
[http://www.perforce.com/perforce/doc.current/manuals/dvcs/index.html]  for more
info and examples.



--
Please click here to see the post in its original format:
  http://forums.perforce.com/index.php?/topic/4029-feature-branching-in-helix



More information about the perforce-user mailing list