[p4] How many of you use a sandbox area for user items
David Faison
dfaison at photon.com
Wed May 10 14:20:35 PDT 2006
I'm not sure what you're definition of sandbox is, but it sounds like it
might be close to what we do here.
We sometimes create user-specific branches off the mainline. A single
user checks code into/out-of this user-specific branch. When their work
is ready, their branch is mainlined. This can be an iterative process.
The p4 call to push code from mainline to user-branch is simple. This
same command is used to create the branch and to update it, if needed,
with changes that occur in the mainline:
"p4 integrate //depot/mainline/... //depot/branchxyz/..."
The p4 call to push it back into the mainline is equally simple. This is
the command that causes the work in the branch to be "mainlined":
"p4 integrate -r //depot/branchxyz/... //depot/mainline/..."
The integrate command produces a changelist that must be submitted like
any other.
You will also need to learn about the "p4 resolve" command in order to
do this process. But it is really very straightforward. The Perforce
documentation tells you everything you need to know.
Note that for mainline-to-branch mappings that are not one-to-one, you
will need to use the "p4 branch" command to define the mapping. But once
that is done, the integrate command gets even simpler.
"p4 integrate -b branchxyz" to go from mainline to branch, and
"p4 integrate -r -b branchxyz" to go back again.
This is the basic branch support mechanism supported by Perforce. It
works wonderfully. You can make it more complicated based on your needs,
but it really can be just this simple.
David Faison
Photon Research Associates
----- Original Message -----
From: "Brian Colfer" <briancolfer at comcast.net>
To: <perforce-user at perforce.com>
Sent: Monday, May 08, 2006 6:16 PM
Subject: [p4] How many of you use a sandbox area for user items.
> List, do you use a sandbox ... or other area defined for user
specific
> items?
>
> That is besides ... you Stephen P.
More information about the perforce-user
mailing list