[p4] Usefulness of "file spec" integrations

[Ivey, William]

For new users, I sometimes explain "integrate" as analogous to
doing a copy in, for example, Windows explorer. It initiates
the copy from the source (just as when you right click a file
in WE and select Copy) but does not complete it in every case,
sometimes requiring an action at the destination: In the case 
of WE, OK-ing an overwrite if the target exists. In the case of
integration, performing a resolve if the destination exists.

That analogy seems to satisfy most of my users initially; it
builds on the familiar at least, even if it glosses over the 
more subtle aspects. 

-Wm


-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Robert Cowham

I sometimes mention to users that the word "branch" is used in 3 ways:

- as the verb "to branch" which "copies" files in a codeline to a
different
codeline.

- as a noun meaning a codeline

- as a noun meaning the Perforce entity more fully called a branch spec.

The perforce "integrate" command will both branch (in verb sense above)
and
propagate changes between codelines (merge). Steve's definition below is
very good.