On Wed, 19 Dec 2007 14:40:48 -0800, David Brown <[EMAIL PROTECTED]> wrote:
On Wed, Dec 19, 2007 at 02:07:51PM -0800, Lan Barnes wrote:
Matt can help me with this, but since p4 is a "branch on checkout"
model,
it really isn't that hard to create a new branch. You simply integrate
your changed file to the new branch, which creates it and retains
history.
P4 doesn't exactly have branches. It allows you to 'integrate' changes
into a different tree in the repo, and remembers the association between
them. The integration has to be done as its own discrete step.
I think it would be better to describe it as: P4 doesn't have branches,
but
it can track merges between trees which can be used to simulate some of
the behavior of branches.
Dave
I usually try to explain it to my developers by saying that directories do
not exist in Perforce. A path/branch exists by the virtue of something
being in it (a file.) So directories can't have branches, but files can.
There is no inter-relationship between branches with the same name on
different files. So sometimes it is hard to articulate the way Perforce
works. I still would call what you do to a file a 'branch', but
directories/paths are second class citizens in Perforce and you can't
rightfully version or branch a directory itself. But you can branch
everything in it and as far as most of my developers are concerned that's
the same thing (though I know the difference.)
-Matt
--
[email protected]
http://www.kernel-panic.org/cgi-bin/mailman/listinfo/kplug-list
