Perforce 2000.1 Command Line User's Guide (2000.1.ug.3)
<< Previous Chapter
Glossary
Table of Contents
Index
Perforce on the Web


Index

Symbols

#
forbidden in filenames    
#have
specifying the revision synced-to    
#head
specifying the latest revision    
#none
specifies the nonexistent revision    
%
forbidden in filenames    
%0 .. %n
example    
wildcard    
*
as wildcard in job searches    
wildcard    
+k
keyword expansion    
...
wildcard    
<
as operator in job queries>    
=
as operator in job queries    
>
as operator in job queries    
>>>>
as diff marker    
@
forbidden in filenames    
syncing to a label's contents    
^
as operator in job queries    

A

accepting
files when resolving    
access level    
adding files    
example    
administration
and depot configuration    
allwrite    
architecture
of Perforce    
atomic change operations
branching and integration    
atomic change transaction      
example    
atomic change transactions    
automating Perforce    

B

base    
base
defined, when resolving    
base file types    
baseless merge    
basics
of Perforce    
BeOS
and symbolic links    
binary files      
and p4 resolve    
branch    
listing files in    
propagating changes with p4 integrate    
when to create    
branch spec
creating with p4 branch    
example    
usage notes    
using with p4 integrate -b    
branch specs
branching with    
deleting    
exclusionary mappings allowed    
branch view    
branch views
creating    
branches
comparing files between    
deleting    
propagating changes between files    
branching    
and p4 branch    
and reverse integration    
automatically with p4 integrate -b    
best practices    
defined    
introduced    
manually, with p4 integrate    
reporting    
two techniques    
vs. copying files    
when files have no common ancestor    
when to branch    
white paper    
with branch spec, example    
bug tracking    
build management
and Perforce    

C

carriage return    
change
pending    
change management
and Perforce    
change review    
and Perforce    
see System Adminstrator's Guide    
changelist
default    
default    
introduced    
submitting    
changelist number    
changelist numbers
vs. labels    
changelists    
adding or removing files from    
and affected jobs, reporting with p4 describe    
and atomic change transactions    
and p4 reopen    
associated jobs, and p4 fixes    
automatic renumbering of    
deleting with p4 change -d    
files open in    
full description with p4 describe    
in relation to jobs    
linking to jobs    
listing by status    
moving files between    
numbered, and p4 submit    
numbered, creating    
processed atomically    
removing jobs from with p4 fix -d    
reporting    
reporting recent    
reporting with p4 changes    
splitting default changelist    
status of    
submitting, and scheduling resolves    
subscribing    
vs. jobs    
changes
atomic    
conflicting      
how to propagate between codelines    
propagating from branched to original files    
propagating from original to branched files    
undoing with p4 revert    
chunks, diff    
client
connecting to server    
mapping to depot files    
Perforce, purpose of    
client root    
defined    
specifying    
use p4 sync #none after changing    
client side
of mapping, defined    
client specification
defining    
deleting    
editing    
client syntax    
client view    
defining with p4 client    
in-depth    
introduced    
specifying    
use p4 sync after changing    
client views
and exclusionary mappings    
client workspace      
and p4 have      
changing client root    
changing view    
comparing files against depot      
defined    
defining with p4 client    
in-depth    
options    
populating with a label's contents    
populating with p4 sync    
refreshing with p4 sync -f    
setting up    
specifying with P4CLIENT    
state of, tracked by Perforce server    
switching between    
client workspaces
listing    
client/server    
clients
and user directories    
clobber    
codeline      
comparing files between    
listing files in    
propagating changes between    
resolving differences between    
when to branch    
command-line
common flags and p4 help usage    
flags, common to all commands    
specifying files on    
commands
and forms    
applying to multiple revisions at once    
for reporting    
reporting      
reporting on jobs    
reporting, and resolves    
comparing
files with p4 diff    
compress    
concepts
Perforce    
concurrent development
defined    
configuration
changing with P4CONFIG    
conflict
file    
conflicting changes    
conflicts
between files    
preventing with p4 lock    
counter    
CR/LF translation    
creating jobs    
creating with p4 label    
crlf    
custom job spec    

D

daemon    
daemons
reporting    
see System Adminstrator's Guide    
default changelist    
introduced    
default changelists    
default depot    
default job spec    
defect tracking    
and Perforce    
interfacing with third-party products    
introduced    
deleting
client specifications    
deleting branch specs    
deleting files    
example    
deleting jobs    
deleting labels    
delta    
delta storage    
depot    
adding files from workspace    
and changelists    
comparing against files in workspace    
compressing files    
copying files to workspace    
default    
defined      
how to organize    
local    
mapping to client files    
remote    
updating after working offline    
depot side
of mapping, defined    
depot syntax      
depots
listing    
multiple    
detached    
development
concurrent, defined    
diff
differences between revisions    
markers    
two algorithms used by Perforce    
diff chunks    
diffs
excluding with p4 describe -s    
suppressing in p4 describe output    
directories
and clients    
directories, empty
removing on sync    
donor file    

E

editing client specifications    
editing files    
example    
email notification    
entering jobs    
environment variables
and p4 set    
how to set    
P4CLIENT      
P4CONFIG      
P4DIFF    
P4EDITOR      
P4HOST    
P4JOURNAL    
P4LOG    
P4MERGE    
P4PAGER    
P4PASSWD      
P4PORT        
P4ROOT    
P4USER    
PWD    
TMP    
error message
from p4 info    
example
advanced integration    
branch spec, using    
creating a label    
linking with jobs and p4 fix    
populating a label    
propagating changes to branch with p4 integrate    
resolving file conflicts    
example set
for this manual    
examples
filling forms with -i and -o    
linking jobs to changelists with p4 user    
p4 job    
RCS keyword expansion    
reporting and scripting    
reporting on jobs    
use of %0 .. %n wildcard    
exclusionary mapping    
exclusionary mappings
allowed in branch spec    
in client views    

F

fields
and jobviews    
file
contents, comparing with p4 diff    
contents, listing with p4 print    
donor    
merge    
merged, when resolving    
multi-forked    
target    
theirs    
yours    
file conflict    
resolving, example    
file conflicts
introduced    
file format
RCS    
file repository    
file revision    
file specifications
branching with    
file type
determined with p4 openedp4 files    
file types    
apple    
binary    
compressed in depot    
determined by Perforce    
explained    
resource    
specifying    
specifying on command line    
symlink    
text    
filenames
spaces in    
files
adding or removing to changelist    
adding to depot    
adding, example    
and the command line    
as in a label    
as of a changelist    
as retrieved into a workspace    
binary    
binary, and p4 resolve    
changed, when working offline    
changing type of when editing    
commands for reporting    
comparing any two with p4 diff2    
comparing depot vs. client with p4 diff    
conflicting    
conflicting, listing    
copying vs. branching    
deleting from depot      
deleting from labels    
displaying with p4 print    
editing in depot    
editing, example    
have revision    
head revision    
in a branch, listing    
in a label, listing    
in labels, listing    
in workspace, but not managed by Perforce    
in workspace, listing with p4 have    
integrated and submitted, listing    
latest revision, specifying    
listing with p4 files    
locking    
managed by Perforce    
mappings and p4 where    
moving between changelists    
moving between client and server    
moving from depot to workspace    
nonexistent revision    
older, specifying    
open, defined    
opened by you or others, listing    
opened, listing    
opening for add    
opening for delete    
opening for edit    
opening in new changelist with p4 reopen    
propagating changes between branches    
removing from workspace with #none    
renaming    
reopening as specific filetype    
re-resolving    
resolved but not submitted, listing      
resolving with p4 resolve    
resolving, which to accept    
revision history with p4 filelog    
revision last-synced-to, specifying    
specific revision    
specific revisions, integrating between    
specifying by date    
specifying by date and time    
specifying in commands    
specifying revision ranges    
specifying revisions    
specifying type of    
specifying type when adding    
specifying with wildcards    
stored in RCS format    
submitting changes to depot    
fixes
to jobs by changelist, and p4 fixes    
flags
common to all commands      
-n, previewing with    
-o, scripting with    
forms
and P4EDITOR    
and Perforce commands    
and standard input/output    
automating processing of    
use of    

G

getting started
with Perforce    

H

have list    
have revision
defined
    
head revision    
and resolving conflicts    
defined
    
help
and p4 help    
on specific commands    
on views    
history
revision, reporting with p4 filelog    
host
of Perforce server    

I

-i
filling forms with standard input    
installation
on NT    
on UNIX    
installing
on NT    
integrate    
lazy copy    
integration
advanced functions    
between specific file revisions    
forcing    
including when using p4 filelog    
listing submitted integrated files    
previewing    
reporting    
reporting commands    
reverse, when branching    
specifying direction of    
technical explanation    
when files have no common ancestor    
Inter-File Branching    
defined    
use of    

J

job
defined    
job reporting commands    
job specification    
job specs
custom    
default    
job tracking      
introduced    
job view    
jobs    
* wildcard    
affected by changelists, and p4 describe    
and views    
creating    
customizing    
deleting    
editing    
entering    
fixed by changelists, and p4 fixes    
in relation to changelists    
linking to changelists    
listing with p4 jobs    
reporting    
searching    
searching by field    
unlinking from changelist    
vs. changelists    
jobviews
and p4 user    
fields    

K

keyword expansion
RCS    
keywords
RCS, examples    
RCS, expanding    

L

label    
creating    
unlocking    
label specifier
without filenames    
label view      
labels
and client workspaces    
defined    
deleting    
deleting files from    
introduced    
listing contents of with p4 files @Labelname    
listing files in    
listing with p4 labels    
owner of, changing    
p4 labelsync to populate    
populating after creation    
protecting with Options: locked    
reporting    
reporting commands    
when to use    
labelsync
ownership required    
lazy copy
and integration    
level
access    
life cycle management    
limitations
description lengths    
valid filenames    
linefeed convention    
listing
file contents with p4 print    
files in a branch    
files in a label    
files resolved but not submitted    
integrated and submitted files    
jobs in system    
opened files    
local syntax    
and wildcards    
defined    
lock    
locked    
locking files    

M

Macintosh
and file types    
and linefeed convention    
resource fork    
resource fork file type    
management
software configuration    
mapping    
client-side    
depot and client sides    
depot-side    
exclusionary    
mappings
and views    
between client and depot files, showing    
conflicting    
examples of    
multiple, and branch specs    
showing with p4 where    
using to rename files in client views    
mappings, exclusionary
allowed in branch spec    
markers, difference    
merge    
baseless    
three-way      
two-way    
merge
defined, when resolving    
file, when resolving    
merge file    
merge, three-way
introduced    
merges
and conflicting changes    
metadata    
reporting with p4 files    
modtime    
changes as of 2000.1    
moving files
between changelists    
multi-forked file    
multiple depots    
multiple mappings
and branch specs    

N

-n
flag, to preview commands    
previewing p4 sync    
namespace
shared for labels, clients, branches, and depots    
network
data compression    
new changelist    
noallwrite    
noclobber    
nocompress    
nocrlf    
nomodtime    
changes as of 2000.1    
normdir    
NT
installer    
NT
and linefeed convention    
and p4 admin    
p4 set and P4PORT    
server    
numbered changelists
creating    

O

-o
flag, and scripting    
writing forms to standard output    
offline
working with Perforce    
older revisions    
opened files
listing    
operators
in job queries    
options
client workspace    
to p4 resolve    
overriding    
owner
of label, changing    

P

p4
common command flags    
purpose of    
p4 add    
example    
p4 admin
and NT    
stopping server with    
p4 branch
creating a branch spec    
deleting branch specs    
p4 branches    
p4 change -d
deleting changelists with    
p4 changes
and changelists    
reporting changelists    
p4 client    
defining client views    
defining client workspace    
p4 counters    
p4 delete    
example    
p4 depots
listing known depots    
p4 describe    
and changelists    
changelists with or without diffs    
p4 diff      
when working detached    
when working offline    
p4 diff2      
p4 edit    
example    
p4 filelog    
including integrations    
reporting revision history    
p4 files    
listing files in a label    
reporting on file metadata    
showing file type    
p4 fix    
example    
p4 fix -d
removing jobs from changelists    
p4 fixes    
p4 have      
use of    
p4 help    
p4 info    
and setting up    
error message    
p4 integrate
actions dependent on source and target files    
and branch specs, syntax    
branching manually with    
example, propagating changes to a branch    
-n preview option    
renaming files with    
technical explanation    
p4 integrate -b
branching automatically with    
p4 job
example    
p4 jobs    
p4 label
creating a label    
p4 label -d
deleting a label    
p4 labels    
lists all known labels    
p4 labelsync
populating labels after creation    
p4 labelsync -d
deleting files from label    
p4 lock    
p4 opened    
listing opened files    
showing file type    
p4 passwd    
p4 print    
displaying files with    
p4 rename    
p4 reopen
changing file type with    
opening files in another changelist    
p4 resolve    
and binary files    
between codelines    
options    
previewing with -n option    
p4 resolve -v
and diff markers    
p4 resolved      
p4 revert
example    
p4 review    
p4 reviews    
p4 set
on Windows clients    
p4 submit    
and wildcards    
failing, and numbered changelists    
fails when resolve is needed    
failures of, and numbered changelists    
p4 sync
purpose of    
scheduling resolves with    
to a label    
p4 sync -f
to refresh your workspace    
p4 sync -n      
sync preview    
p4 typemap    
p4 user
and passwords    
JobView field    
linking jobs to changelist, example    
p4 users
and email addresses    
listing known users    
p4 where    
and file mappings    
P4CLIENT    
specifying client workspace    
P4CONFIG    
use of    
p4d    
host    
port    
purpose of    
p4d.exe    
P4DIFF    
P4EDITOR    
and forms    
P4HOST    
P4JOURNAL    
P4LOG    
P4MERGE    
P4PAGER    
P4PASSWD      
P4PORT    
and server    
setting      
P4ROOT      
p4s.exe    
P4USER    
parametric substitution      
passwords
and p4 user    
use of    
pending change    
pending changelist    
pending changelists
deleting with p4 change -d    
Perforce
and changelists    
basics    
branching techniques    
concepts    
reporting commands    
setting up depots    
uses of    
Perforce client
connecting to server    
purpose of    
Perforce labels    
Perforce server    
and P4PORT    
connecting to    
host    
port    
purpose of    
tracks state of client workspace    
vs. service    
working when disconnected from    
Perforce service
vs. server    
Perforce syntax
and wildcards    
defined    
perforce.exe    
permissions    
see System Adminstrator's Guide    
port
for server    
of Perforce server    
pre-submit trigger    
preview sync
with p4 sync -n    
previewing
commands with -n flag    
effects of an integration    
effects of p4 resolve    
effects of sync with p4 sync -n    
label contents with p4 labelsync -n    
previewing sync    
propagating changes
to branch with p4 integrate    
protections
see System Adminstrator's Guide    
PWD    

R

RCS format    
and files    
RCS keyword expansion    
+k modifier    
examples    
recent changelists
and p4 changes    
registry settings
for P4PORT    
release management
and Perforce    
remote depot    
removing files
from depot    
from workspace with #none    
renaming files    
renumbering
of changelists, automatic    
reporting    
and daemons    
and labels    
basic commands    
branches    
changelists    
changelists with p4 changes    
file metadata with p4 files    
files affected by integration    
integration      
jobs      
jobs fixed by changelists with p4 describe    
with scripting    
reporting commands    
and resolves    
for files    
labels    
repository
file    
see depot    
resolve    
previewing    
when needed    
which file to accept?    
resolved
files, listing before submission    
resolves
and branching    
multiple, preventing with p4 lock    
performing with p4 resolve    
reporting    
scheduling    
scheduling with changelist submission    
scheduling with p4 sync    
resolving
between codelines    
conflicting changes    
diff chunks    
introduced    
resolving files
multiple resolutions before submission    
resource fork      
result
defined, when resolving    
reverse delta storage    
reverse integration    
when branching    
revert    
reverting changes
example    
revision
base    
file    
have, defined    
head    
head, defined    
tip    
revision history
and p4 filelog    
reporting with p4 filelog    
revision number    
revision range    
revision ranges    
revision specification    
revision specifiers    
without filenames    
revisions
and diffs    
rmdir    
root
client, defined    

S

SCM    
defined    
scripting
and reporting    
with -o flag    
scripting Perforce
examples    
searching
jobs    
server
connecting to    
NT    
Perforce    
Perforce, purpose of    
port    
stopping with p4 admin    
verifying connection with p4 info    
vs. service    
server root
and P4ROOT    
creating    
defined    
setting environment variables    
on an NT service    
setting up
and p4 info    
client workspaces    
Perforce    
shell
parsing wildcards    
Software Configuration Management    
software configuration management    
spaces
in filenames    
special characters
in filenames    
specification
revision    
specifying
file type    
standard input
and forms    
standard output
and forms    
and p4 print    
stopping server
with p4 admin    
storage
full-file vs. delta    
reverse delta    
submit    
submitted changelist    
submitting
multiple changes at once    
submitting changes    
subscribe
to changelist    
symbolic links    
and file types    
on non-UNIX systems    
sync
forcing with -f    
preview    
sync preview
with p4 sync -n    
syntax
client    
depot      
local      
Perforce syntax    
use of when specifying files    
system administration
checkpoint    
groups    
journal    
reporting    

T

target files    
TCP/IP
and Perforce architecture    
and port number    
text files        
the    
theirs    
theirs
defined, when resolving    
third-party
linking with defect tracking systems    
three-way merge        
and binary files    
when scheduled    
time zones
and p4 info    
timestamps
on DLLs, preserving
    
tip revision    
TMP    
tracking
defects    
jobs    
translation
CR/LF    
trigger    
triggers
see System Adminstrator's Guide    
two-way merge    
typemap
file types    

U

umask(1)    
UNIX
and linefeed convention    
unlocked    
usage notes
integration    
user passwords    
users
email addresses    
reporting on    
using forms    

V

-v flag
diff markers and p4 resolve    
variables
environment, how to set    
version control    
defined    
view    
branch    
client    
client, defining with p4 client    
client, in-depth    
client, introduced    
client, specifying    
job    
label    
views
and conflicting mappings    
and mappings    
and wildcards    
branch, creating    
changing filenames with mappings    
examples of mappings    
help on    
jobviews    
label    
multiple mapping lines    
using exclusionary mappings    

W

warnings
# and local shells    
binary files and delta storage    
when to create a label    
white paper
best practices    
on branching    
Streamed Lines    
wildcards    
%0 .. %n    
%0 .. %n example    
*    
...    
and local shell    
and local syntax    
and Perforce syntax    
escaping on command line, and p4 submit    
in jobviews    
in views    
Windows
and linefeed convention    
setting environment variables    
setting variables on an NT service    
third-party DLLs    
workaround
spaces in filenames    
working detached    
working offline    
workspace
and p4 have    
client      
client, in-depth    
client, populating with a label's contents    
comparing files against depot    
populating with p4 sync    
refreshing    

Y

yours    
yours
defined, when resolving    

Perforce 2000.1 Command Line User's Guide (2000.1.ug.3)
<< Previous Chapter
Glossary
Table of Contents
Index
Perforce on the Web
Please send comments and questions about this manual to [email protected].
Copyright 1997, 1998, 1999, 2000 Perforce Software. All rights reserved.
Last updated: 10/09/00