Introduction to Perforce for Users · Perforce Training Course, 2010.1 2 Course Contents •...

Perforce Training Course, 2010.1

Introduction toPerforce for Users

Introduction

• IntroductionsIntroductions

• Class Schedule

• GUI vs. CLI

• About the Exercises

Course Contents• Overview• Basic File Operations

H l !• Help!• File Information• Changelist Management• Handling File Conflicts• Client Workspace Management• Labels• Branching and Integration• Job Tracking• P4V

Overview

• Client/Server ModelClient/Server Model

• Server

• Client Programs

• Changelists

• Client...

The Perforce client-server model

Client

Clientprogram

program

Perforceserver

Clientprogram

The Perforce server

DatabaseDepot

Perforceserver

Database

Perforce client programs

Joe-adminClient

Workspace

Joe-dev Client

Workspace

. . .. . .

Changelists

Changelist3567//depot/Jam/MAIN/src/ape.c#23 edit

//depot/Jam/MAIN/src/bear.c#1 add

//depot/Jam/MAIN/src/eland.c#14 edit

//depot/Jam/MAIN/src/lion.c#3 delete

//depot/Jam/MAIN/src/zebra.c#9 edit

Client ...

• Client machine• Client machine

• Client programs

• Client workspaces

Showing connection informationp4 infoUser name: bobClient name: bob-jamClient name: bob jamClient host: marsClient root: c:\workCurrent directory: c:\work\Jam\MAIN\srcClient address: 103.14.25.211:1719Server address: london:1666Server root: /usr/perforce/ /pServer date: 2010/06/15 12:55:14 -0800 PSTServer uptime: 382:14:58Server version: P4D/FREEBSD/2010.1/244883...Server license: Perforce Software 200 users...Case Handling: sensitive

If you have a password in Perforce

• Starting a sessionp4 loginEnter password:User marta logged in.

• Ending a sessionp4 logoutp gUser marta logged out.

Commands in this Chapter

• p4 infop4 info• p4 login• p4 logout

Basic File Operations

Basic Operations

• Populating a Client Workspace• Populating a Client Workspace

• Editing, Adding and Deleting Files

• Moving Files

• Reverting Files

• Assessing Current Status

• Submitting Changes

Populating a client workspace

p4 sync//depot/Jam/MAIN/src/README#26 - added as//depot/Jam/MAIN/src/README#26 - added as

c:\work\Jam\MAIN\src\README//depot/Jam/MAIN/src/regexp.c#2 - added as

c:\work\Jam\MAIN\src\regexp.c//depot/Jam/MAIN/src/regexp.h#1 - added as

c:\work\Jam\MAIN\src\regexp.h//depot/Jam/MAIN/src/RELNOTES#77 - added as

c \ ork\Jam\MAIN\src\RELNOTESc:\work\Jam\MAIN\src\RELNOTES//depot/Jam/MAIN/src/rules.c#5 - added as

c:\work\Jam\MAIN\src\rules.c

...etc.

Editing client workspace files

cd work\Jam\MAIN\src

p4 edit rules.c rules.h

//depot/Jam/MAIN/src/rules.c#5 - opened for edit//depot/Jam/MAIN/src/rules.h#2 - opened for edit

t d lnotepad rules.cnotepad rules.h

Adding new files

notepad alias.c

notepad check cnotepad check.c

p4 add alias.c check.c

//depot/Jam/MAIN/src/alias.c#1 - opened for add//depot/Jam/MAIN/src/check.c#1 - opened for add

4 dd t bi l dfp4 add -t binary logo.pdf

//depot/Jam/MAIN/images/logo.pdf#1 - opened for add

Deleting files

p4 delete exec.c //depot/Jam/MAIN/gizmo/dir.c

//depot/Jam/MAIN/src/exec.c#2 - opened for delete

//depot/Jam/MAIN/gizmo/dir.c#3 - opened for delete

Moving files

p4 edit filemac.c

//depot/Jam/MAIN/src/filemac.c#3 - opened for edit

p4 move filemac.c fileosx.c

//depot/Jam/MAIN/src/fileosx c#1 - moved from//depot/Jam/MAIN/src/fileosx.c#1 moved from

//depot/Jam/MAIN/src/filemac.c#3

Reverting client workspace files

p4 revert rules.h alias.c fileosx.c // / / / ///depot/Jam/MAIN/gizmo/dir.c //depot/Jam/MAIN/images/logo.pdf

//depot/Jam/MAIN/gizmo/dir.c#3 – was delete, reverted

//depot/Jam/MAIN/images/logo.pdf#none – was add, abandoned//depot/Jam/MAIN/src/alias.c#none - was add, abandonedp

//depot/Jam/MAIN/src/rules.h#2 - was edit, reverted//depot/Jam/MAIN/src/filemac.c#3 - was move/delete, reverted//depot/Jam/MAIN/src/fileosx.c#none - was move/add, deleted

Assessing work in progress

• Which files are you working on?

• What changes have you made?

Which files are you working on?

p4 opened//depot/Jam/MAIN/src/check.c#1 - add default change (text)

//d t/J /MAIN/ / #2 d l t d f lt h (t t)//depot/Jam/MAIN/src/exec.c#2 - delete default change (text)

//depot/Jam/MAIN/src/rules.c#5 - edit default change (text)

//depot/Jam/MAIN/src/filemac.c#3 - move/delete default change (text)

//depot/Jam/MAIN/src/fileosx.c#1 - move/add default change (text)

p4 opened -C bojam//depot/Jam/MAIN/src/make.c#5 - edit default change (text) by bob@bojam//d t/J /MAIN/ / #7 dit d f lt h (t t) b b b@b j//depot/Jam/MAIN/src/rcp.c#7 - edit default change (text) by bob@bojam

p4 opened –u bob//depot/Jam/MAIN/src/make.c#5 - edit default change (text) by bob@bojam//depot/Jam/MAIN/src/rcp.c#7 - edit default change (text) by bob@bojam//depot/Jam/MAIN/src/trans.h#9 - edit default change (text) by bob@jelly

What changes have you made?

p4 diff rules.c

==== //depot/Jam/MAIN/src/rules.c#5 -c:\work\Jam\MAIN\src\rules.c ====

76c76< TARGET target, t = &target;---> TARGET target *t = &target;> TARGET target, *t = &target;

Submitting files

Client Workspace

50565057

rules.c#5check.c#1

exec.c#2

Change 5061 created with 6 open file(s).Ch

Submitting a changelist

p4 submitChange 5061 created with 6 open file(s).Submitting change 5061.Locking 6 files ...add //depot/Jam/MAIN/src/check.c#1delete //depot/Jam/MAIN/src/exec.c#3move/delete //depot/Jam/MAIN/src/filemac.c#2move/add //depot/Jam/Main/src/fileosx.c#1

Change: newDescription:

Files://depot/Jam/MAIN/src/check.c # add//depot/Jam/MAIN/src/exec c # delete

Added “check” function.Added “check” function.

edit //depot/Jam/MAIN/src/parse.c#7edit //depot/Jam/MAIN/src/rules.c#6Change 5061 submitted..

//depot/Jam/MAIN/src/exec.c # delete//depot/Jam/MAIN/src/filemac.c # move/delete//depot/Jam/MAIN/src/fileosx.c # move/add//depot/Jam/MAIN/src/parse.c # edit//depot/Jam/MAIN/src/rules.c # edit

Previewing client workspace file update

p4 sync -n//depot/Jam/MAIN/src/README#27 - updating//depot/Jam/MAIN/src/README#27 updating

c:\work\Jam\MAIN\src\README//depot/Jam/MAIN/src/regexp.c#3 - updating

c:\work\Jam\MAIN\src\regexp.c//depot/Jam/MAIN/src/regexp.h#2 - updating

c:\work\Jam\MAIN\src\regexp.h//depot/Jam/MAIN/src/RELNOTES#79 - updating

c:\work\Jam\MAIN\src\RELNOTESc:\work\Jam\MAIN\src\RELNOTES//depot/Jam/MAIN/src/varexp.c#8 – added as

c:\work\Jam\MAIN\src\varexp.c

...etc.

New Commands in this Chapter

• p4 sync • p4 revertp y

• p4 edit

• p4 add

• p4 delete

• p4 move

• p4 opened

• p4 diff

• p4 submit

• p4 move

• Command Summary Helpy p

• Help for a Specific Command

• Online Perforce Documentation

• E-mail Perforce

• Perforce-User Mailing ListPerforce User Mailing List

Command summary helpp4 help

p4 is Perforce's client tool for the command line. Try:

p4 help simple p4 help commandsp4 help command

p4 help charsetp4 help environmentp4 help filetypes

list most common commandslist all commandshelp on a specific command

help on character set translationlist environment and registry variableslist supported file types

p4 help jobviewp4 help revisionsp4 help usagep4 help views

pp yphelp on jobview syntaxhelp on specifying file revisionsgeneric command line argumentshelp on view syntax

Perforce commands

p4 help commands

Perforce client commands:

add Open a new file to add it to the depotadmin Perform administrative operations on the serverannotate Print file lines along with their revisionsbranch Create or edit a branch specificationbranches Display list of brancheschange Create or edit a changelist descriptionchanges Display list of pending and submitted changelistsg p y p g gchangelist Create or edit a changelist descriptionchangelists Display list of pending and submitted changelists

...etc.

Help for a specific commandp4 help delete

delete -- Open an existing file to delete it from the depot

p4 delete [ -c changelist# ] [ -n –v ] file ...

Opens a file that currently exists in the depot for deletion. If the file is present on the client it is removed. If a pending changelist number is given with the -c flag the opened file is associated with that changelist, otherwise it is associated with the 'default' pending changelist.

Files that are deleted generally do not appear on the have list.

The -n flag displays what would be opened for delete without actually changing any files or metadata.

The -v flag allows deleting of files that are not synced into the client workspace.

Documentation on Perforce’s web site

• Introducing Perforce• P4 User’s Guide• Perforce Command Reference• Perforce System Administrator’s Guide• Release Notes

K l d B• Knowledge Base• White Papers

Help via E-mail

• E-mail Perforce at:• support@perforce.com• sales@perforce.com• manual@perforce.com• info@perforce.com

• Perforce-User mailing list• Subscribe from Perforce web site• Exchange ideas with other Perforce users

• p4 helpp4 help

File Information

File patterns

• Wildcardsp4 syncp4 sync ...p4 sync //depot/Jam/MAIN/...p4 sync //depot/Jam/MAIN/doc/J*p4 sync //depot/Jam/MAIN/src/*p4 sync ..\...

L l d t i• Local vs. depot expansionp4 sync *.cp4 sync "*.c"

Help for revision specifications

p4 help revisions

Specifying file revisions and revision ranges:Some file-related Perforce client commands can limit theiractions to specific file revisions. A revision specification is tacked onto the end of the filename, andis one of the following:

#rev - A revision number.@change - A change number: the revision as of that change.@client - A client name: the revision on the client.@label - A label name: the revision in the label.@ abe abe a e: t e e s o t e abe .@date - A date or date/time: the revision as of that time.

Either yyyy/mm/dd or yyyy/mm/dd:hh:mm:ssNote that yyyy/mm/dd means yyyy/mm/dd:00:00:00,so if you want to include all events on that day refer to the next day.

#rev has special variants, to be used literally:...

Revision specifications

Type SyntaxRevision number #7Revision number #7

Changelist number @30

Client Workspace name @sams_ws

Label name @rlslabel

Latest revision #head

Revision last synced #have

Non-existent revision #none or #0

Date @2006/08/23

Revision specification examplesp4 sync utils.c#2p4 sync utils.c@431p4 diff utils.c@431p4 sync @431p4 changes ...@431p4 changes //depot/Jamgraph/DEV/gizmo/*.c@431p4 files //my_ws/Jamgraph/DEV/src/...@431p4 sync @sams_wsp4 sync @janslabelp4 sync util c#headp4 sync util.c#headp4 files //depot/Acme-api/...#havep4 sync //depot/notes/....txtp4 sync #nonep4 sync util.c@2001/05/29p4 files //depot/Jam/...@2001/05/29:15:37:00

Revision ranges

• Limiting commands to a revision rangep4 changes abc.c@20,@32p4 changes abc.c@20,@32p4 changes xyz.c@jam-1.0,@jam-2.0

p4 files //depot/Jam/MAIN/...@431,@431

• Some commands accept revision rangesp4 changes p4 integ p4 syncp4 changes p4 integ p4 syncp4 jobs p4 files p4 printp4 fixes

Comparing files in the depot

p4 diff2 hash.c#1 hash.c#2

==== //depot/Jam/MAIN/src/hash.c#1 –//depot/Jam/MAIN/src/hash.c#2 ====

Copyright information.

What files have changed?

p4 diff2 -q //depot/...@231 //depot/...@250

==== //depot/Jam/MAIN/src/jam.1#30 (text) –//depot/Jam/MAIN/src/jam.1#32 (text) ==== content

==== //depot/Jam/MAIN/src/jam.c#13 (text) –

//depot/Jam/MAIN/src/jam.c#15 (text) ==== content

==== //depot/Jam/MAIN/src/jam.h#17 (text) –

//depot/Jam/MAIN/src/jam.h#18 (text) ==== content//depot/Ja / /s c/ja . # 8 (te t) co te t

==== <none> - //depot/Jam/MAIN/src/Jambase.ps#1 ====

==== <none> - //depot/Jam/MAIN/src/Jamfile.ps#1 ====

Deleting and re-adding a filep4 delete parse.h//depot/Jam/MAIN/src/parse.h#9 - opened for

delete

p4 submitp4 submitChange 5066 created with 1 open file(s).Submitting change 5066.delete //depot/Jam/MAIN/src/parse.h#10Change 5066 submitted.

p4 sync parse.h#9

p4 add parse.h// / / / / #//depot/Jam/MAIN/src/parse.h#10 – opened for add

p4 submitChange 5068 created with 1 open file(s).Submitting change 5068.add //depot/Jam/MAIN/src/parse.h#11Change 5068 submitted.

File reporting

• Depot info for one revision p4 files utils.c// / / / ///depot/Jam/MAIN/gizmo/utils.c#3 -

edit change 121 (text)

p4 files utils.c#2//depot/Jam/MAIN/gizmo/utils.c#2 -

• Revision history• Revision historyp4 filelog utils.c//depot/Jam/MAIN/gizmo/utils.c... #3 change 121 edit ... ‘add reuse feature’... #2 change 119 edit ... ‘fix startup bug’... #1 change 67 add ... ‘add Gizmo src files’

Show file contents with revisions

p4 annotate jam.c//depot/Jam/MAIN/src/jam.c#35 - edit change 627 (text)

...etc.

p4 annotate -a -c jam.c

//d t/J /MAIN/ /j #35 dit h 627 (t t)//depot/Jam/MAIN/src/jam.c#35 - edit change 627 (text)1-627: /*1-627: * /+\1-1: * +\ Copyright 1993 Christopher Seiwald.30-248: * +\ Copyright 1993, 1995 Christopher Seiwald.

...etc.

Search for patterns in filesp4 grep -e "rules.h" //depot/Jam/MAIN/...@390//depot/Jam/MAIN/src/command.c#8:

# include "rules.h"//depot/Jam/MAIN/src/compile.c#25:

* directly to the rule (as defined in rules.h).//depot/Jam/MAIN/src/headers.c#5:

# include "rules.h"//depot/Jam/MAIN/src/jam.c#35:

# include "rules.h“//depot/Jam/MAIN/src/Jamfile#55:

regexp.c regexp.h rules.c rules.h scan.c scan.h

...etc.

What's in your client workspace?

p4 have

//depot/Jam/MAIN/src/Build.com#7 –\ k\ \ \ \ ildc:\work\Jam\MAIN\src\Build.com

//depot/Jam/MAIN/src/Build.mpw#1 –c:\work\Jam\MAIN\src\Build.mpw

//depot/Jam/MAIN/src/command.c#8 –c:\work\Jam\MAIN\src\command.c

p4 files //depot/Jam/MAIN/src/Build.com#have//depot/Jam/MAIN/src/Build.com#7 –

• Base file types:text symlink unicode utf16

File types

binary apple resource

• Workspace storage attributes+x - executable+w - always writable+k - RCS keyword

+ko - RCS keyword (old style)+l - exclusive open+m - sync vs submit modtime

• Server storage attributes+S - latest revision+C - compressed

+k RCS keyword +m sync vs. submit modtime

+D - deltas+F - full file

Changing existing file types

p4 edit -t text genfilesp4 edit t text genfiles

p4 reopen -t binary+lm doit

p4 reopen -t +w runtime.txt

• p4 help revisions • p4 filelog• p4 help revisions• p4 changes• p4 have• p4 files

• p4 filelog• p4 annotate• p4 diff2• p4 reopen

Changelist Management

Change: new

Working with multiple changelists

p4 change

Change: newClient: bob-jamUser: bobStatus: newDescription:

<enter description here>Files

Fix off-by-one error.Files:

//depot/Jam/MAIN/src/compile.c # edit

Change 5069 created with 1 open file(s).

Editing the new changelist

p4 change 5069

Change: 5069Change: 5069Client: bob-jamUser: bobStatus: pendingDescription:

Fix off-by-one error. Use UTC time.y

Files://depot/Jam/MAIN/src/compile.c #edit

Manipulating files in changelists

• Open files into specific changelistp4 edit -c 1542 //cl/Jam/MAIN/src/make.c

p4 add -c 528 hash.h hash.c

p4 delete -c 49 //depot/Jam/MAIN/src/filent.c

• M fil b t h li tp4 reopen -c 1542 *.sh

p4 reopen -c default //...

• Move open files between changelists

Listing changelists

p4 changes headers cp4 changes headers.c

Change 316 ... 'Finalized jam support for actio'Change 284 ... 'Support for multiple :'s on jam'Change 77 ... 'Include newstr.'Change 30 ... 'Copyright info.'Change 1 ... 'Initial revision'

p4 submit c 5072

Submitting a numbered changelist

p4 submit -c 5072

Submitting change 5072.Locking 3 files ...add //depot/Jam/MAIN/src/newstr.c#1delete //depot/Jam/MAIN/src/execmac.c#3edit //depot/Jam/MAIN/src/rules.c#7Change 5072 renamed 5079 and submitted.

Shelving opened filesp4 shelveShelving files for change 700.di //d / / / /j #45Change: newedit //depot/Jam/MAIN/src/jam.c#45edit //depot/Jam/MAIN/src/lists.c#6edit //depot/Jam/MAIN/src/lists.h#4Change 700 files shelved.

Client: bob-jamUser: bobStatus: newDescription:

<enter description here>Files:// / / / /

Shelving current edits.

//depot/Jam/MAIN/src/jam.c # edit//depot/Jam/MAIN/src/lists.c # edit//depot/Jam/MAIN/src/lists.h # edit

p4 revert //...

Shelved files are accessible to other users

p4 unshelve -s 700//depot/Jam/MAIN/src/jam.c#45 - unshelved,

opened for editopened for edit//depot/Jam/MAIN/src/lists.c#6 - unshelved,

opened for edit//depot/Jam/MAIN/src/lists.h#4 - unshelved,

opened for edit

p4 diff jam.c@=700//d / / / /j #45==== //depot/Jam/MAIN/src/jam.c#45 –c:\earl-os2\Jam\MAIN\src\jam.c ====

37,39d36< # ifdef NTFS< # include "daylight.h"< # endif

Owners may delete shelved files

p4 changes -s shelvedChange 700 on 2009/11/06 by bob@bob-jam *pending* 'Shelvingcurrent edits. '

4 h l d 700p4 shelve -d -c 700Shelve 700 deleted.

Showing changelist detail

p4 describe 135Change 135 by earl@earl-dev on 2000/07/02 10:15:38

Windows NT changes.Affected files ...... //depot/Jam/MAIN/src/Jambase#52 edit... //depot/Jam/MAIN/src/Jamfile#18 edit... //depot/Jam/MAIN/src/RELNOTES#15 editDifferences ...==== //depot/Jam/MAIN/src/Jambase#52 (text) ====

...etc.

• p4 changep4 change

• p4 shelve

• p4 unshelve

4 d ib• p4 describe

Handling File Conflicts

• File ConflictsFile Conflicts

• Resolving Conflicts

• Conflicting Diffs

• Reporting Commands

• Backing out a Changelist

File conflicts

T dit th fil• Two users edit the same file

• First user submits

• Second user submits or re-syncs

• Resolve is ‘scheduled’• Resolve is scheduled

xyz.cp4 syncp4 editp4 submit

p4 syncp4 editp4 submit

p4 syncp4 editp4 syncp4 edit

depotjon-jam ann-jamxyz.c#3

xyz.c#4p4 submitp4 submit

p4 submitp4 submit

A failedxyz.cp4 resolvep4 resolve

p4 submitp4 submitxyz.c#5

A failedsubmit

A failed submit

p4 submitCh 5085 t d ith 4 fil ( )Change 5085 created with 4 open file(s).Submitting change 5085.//depot/Jam/MAIN/src/rules.c -must resolve before submitting

//depot/Jam/MAIN/src/rules.c –must resolve #6,#7

Out of date files must be resolved orOut of date files must be resolved orreverted.

Submit failed -- fix problems above then use ‘p4 submit -c 5085’.

When to use resolve

• After a failed submitAfter a failed submit

• After re-syncing opened files

• When integrating between branches

depotclient workspace

xyz.c#3

“b ”“b ”editor

“base”“base”

“merged”“merged”

“yours”“yours”xyz.c#4

“theirs”“theirs”xyz.c

“result”“result”

Resolve interactively

p4 resolvep

c:\work\Jam\MAIN\src\rules.c- merging //depot/Jam/MAIN/src/rules.c#6,#7

Diff chunks: 0 yours + 1 theirs + 0 both + 1 conflicting

Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) e:Skip(s) Help(?) e:

Using resolve help

p4 resolve...Accept(a) Edit(e) Diff(d) Merge(m)

Skip(s) Help(?) e: ?...Accept:at Keep only changes to their file.ay Keep only changes to your file.y p y g yam Keep merged file.ae Keep merged and edited file.a Keep autoselected file.

Resolve’s “accept” actions

• Accept mergedAccept merged

• Accept edited

• Accept theirs

• Accept yoursp y

Before accepting, you can...

Edit... Diff...• merged file

• your file

• their file (read-only)

• yours vs. base

• theirs vs. base

• merged vs. base

• merged vs. yours

Skip• to resolve later, or revert

Resolving conflicting diffs

• T pes of diff ch nks• Types of diff chunks• theirs

• yours

• both

• conflicting

Conflict markers in the merged file

# include "jam.h"# include "option.h"

theirs yours

# include option.h# include "patchlev.h"# include "make.h"

# include option.h# include "patchlevel.h"# include "make.h"

# include "jam.h"# include "option.h"

# include "jam.h"# include "option.h">>>> ORIGINAL //depot/Jam/MAIN/xyz c#3

merged result (after editing)

# ifdef FATFS# include "patchlev.h"# else# include "patchlevel.h"# endif# include "make.h"

>>>> ORIGINAL //depot/Jam/MAIN/xyz.c#3==== THEIRS //depot/Jam/MAIN/xyz.c#4# include "patchlev.h"==== YOURS //bruno_ws/Jam/MAIN/xyz.c# include "patchlevel.h"<<<<# include "make.h"

Resolve many files by accepting...

• Yours (workspace file)p4 resolve -ay

• Theirs (depot file)p4 resolve -at

• Yours or theirs, if only one differsp4 resolve -as

• Yours, theirs or merged, if no conflictsp4 resolve -am

Textual vs. binary resolves

• Three-way resolvesO t t t fil• Operate on text files

• Use Yours, Theirs, and Base• Files can be merged

• Two-way resolves• Operate (by default) on binary files• No binary diffs stored, so files can’t be merged• Resolve choices: accept yours or theirs

Showing which files need resolvingp4 resolve -nc:\work\Jam\MAIN\src\rules.c -

merging //depot/Jam/MAIN/src/rules.c#6,#7

Listing files already resolvedp4 resolvedc:\work\Jam\MAIN\src\hash.c -

merged from //depot/Jam/MAIN/src/hash.c#4,#6

Re-doing a resolvep4 resolve -f hash.c

Showing revision at last sync

p4 have rules.c//depot/Jam/MAIN/src/rules.c#5 –

c:\work\Jam\MAIN\src\rules.c

Locking files

p4 lock rules cp4 lock rules.c

//depot/Jam/MAIN/src/rules.c - locking

Showing opened filesp4 opened//depot/Jam/MAIN/src/check.c#1 - add change 5085//depot/Jam/MAIN/src/exec c#2 delete change 5085

Showing pending changelists

//depot/Jam/MAIN/src/exec.c#2 - delete change 5085//depot/Jam/MAIN/src/hash.c#6 – edit change 5085//depot/Jam/MAIN/src/rules.c#7 - edit change 5085

p4 changes –s pending

Change 5085 on 2005/11/27 by bob@bob-jam*pending* 'Added "check" function '

p4 submit -c 5085

Resubmitting a changelist

p4 submit c 5085

Submitting change 5085.Locking 4 files ...add //depot/Jam/MAIN/src/check.c#1delete //depot/Jam/MAIN/src/exec.c#3edit //depot/Jam/MAIN/src/hash.c#7dit //d t/J /MAIN/ / l #8edit //depot/Jam/MAIN/src/rules.c#8Change 5085 renamed change 5089 and submitted.

When submit fails

• Default changelist becomes numberedDefault changelist becomes numbered changelist

• Depot and client workspace files unchanged

• Out-of-date files marked unresolved and opened at #headopened at #head

Why submit fails

• If it is interruptedp

• If any file in the changelist is:• not opened at #head

• unresolved

• locked in another client workspacep

• not accessible in your client workspace

depotjon-jam ann-jam

xyz.cp4 syncp4 syncp4 editp4 editp4 syncp4 syncp4 editp4 edit

xyz.cp4 syncp4 syncp4 editp4 editp4 submitp4 submit

p4 syncp4 syncp4 editp4 editp4 submitp4 submit

xyz.c#3

Re-syncingd

p4 syncp4 syncp4 syncp4 syncp4 resolvep4 resolvep4 resolvep4 resolve

xyz.c#4pppp

an openedfilep4 submitp4 submitp4 submitp4 submit xyz.c#5

Re-syncing client workspace with opened files

p4 sync

//depot/Jam/MAIN/src/regexp.c#5 - updating c:\work\Jam\MAIN\src\regexp.c

//depot/Jam/MAIN/src/regexp.h#9 - updating c:\work\Jam\MAIN\src\regexp.h

//depot/Jam/MAIN/src/RELNOTES#79 - is d d t b i h dopened and not being changed

... //depot/Jam/MAIN/src/RELNOTES must resolve #79 before submitting

Backing out a changelist

p4 sync @6024

p4 edit index c command hp4 edit index.c command.h

p4 sync

p4 resolve -ay

p4 submitCh 6026 t d ith 2 fil ( )Change 6026 created with 2 open file(s).Locking 2 files ...Submitting change 6026.edit //depot/Jam/MAIN/src/index.c#11edit //depot/Jam/MAIN/src/command.h#6Change 6026 submitted.

• p4 resolvep

• p4 resolved

• p4 lock

Client Workspace Management

• Creating a Client Workspace• Creating a Client Workspace

• Client Workspace View Mappings

• Referring to Files: Three Syntaxes

• Working OfflineWorking Offline

• Environment Setup

Client workspaces

Client workspace spec includesClient workspace spec includes

• Name

• Root

• View of the depotView of the depot

Creating a client workspace specp4 clientClient: bob-devU d t 2009/11/15 12 39 47Update: 2009/11/15 12:39:47Access: 2010/06/03 16:33:25Owner: bobHost: perseusDescription:

Bob's main development workspace.Root: c:\workOptions: noallwrite noclobber nocompress unlocked

nomodtime normdirSubmitOptions: submitunchangedLineEnd: localView://depot/Jam/MAIN/... //bob-dev/Jam/MAIN/...

Client workspace view mappings

Client: bob-jam

p4 client

Root: c:\p4work

View://depot/Jam/MAIN/src/... //bob-jam/Jam/MAIN/src/...

-//depot/Jam/MAIN/src/tests/... //bob-jam/Jam/MAIN/src/tests/...

//depot/Jam/MAIN/src/*.h //bob-jam/Jam/MAIN/src/hfiles/*.h

//depot/Jam/MAIN/cfg/* //bob-jam/Jam/MAIN/config/*//depot/Jam/MAIN/cfg/ //bob jam/Jam/MAIN/config/

//depot/Acme-api/....cpp //bob-jam/Acme-api/....CC

//depot/Jam/REL1.0/src/... //bob-jam/Jam/REL1.0/src/...

+//depot/Jam/PATCH1.0/src/... //bob-jam/Jam/REL1.0/src/...

Client workspace options

• Sync options[no]allwrite [no]compress[no]clobber [un]locked[no]modtime [no]rmdir

• Submit optionssubmitunchangedrevertunchangedrevertunchangedleaveunchanged

• LineEnd valueslocal unix mac win share

Creating additional client workspaces

• Use multiple client workspaces

p4 client bob-jam-project_a

• Copy a client workspace’s view and options

p4 client -t bob-jam-dev mary-jam-dev

• List only your user’s client workspace specs

p4 clients -u bob

Commands that start up a text editor

p4 client p4 branchp4 clientp4 submitp4 changep4 user

p4 branchp4 jobp4 label

Testing client workspace view mappings

• Show depot and client workspace paths

p4 where command.c//depot/Jam/MAIN/src/command.c //mel-dev/Jam/MAIN/src/command.c d:\mel-dev\Jam\MAIN\src\command.c

• File doesn’t have to exist for p4 where to work

Referencing files

• Depot syntaxp4 sync //depot/Jam/MAIN/src/util cp4 sync //depot/Jam/MAIN/src/util.c

• Client Workspace syntax

p4 sync //jungle-jam/Jam/MAIN/src/util.c

• Local syntaxLocal syntaxp4 sync util.cp4 sync c:\work\Jam\MAIN\src\util.cp4 sync ..\src\util.c

Listing client workspace files altered offline

p4 diff -seContents changed since last sync

p4 diff -sdFiles removed since last syncy

Building a changelist after working detached

cd c:\sean-jam\Jam\MAIN\srccd c:\sean jam\Jam\MAIN\src

dir /s/b/a-d | p4 -x - add

p4 diff -sd ... | p4 -x - delete

p4 diff -se ... | p4 -x - edit

New Commands in this Chapter, Part 1

• p4 client• p4 client

• p4 where

• p4 diff -sd

• p4 diff -se

• p4 -x - or p4 -x filename

Client Workspace Management

Intermission!

Client Workspace Management Exercises Part 1

Environment setup

• Showing connection information

• Resetting server port and client workspace

• Setting the Perforce configuration

Showing connection information

p4 infoUser name: bobClient name: bob-jamClient host: marsClient root: c:\workCurrent directory: c:\work\Jam\MAIN\srcClient address: 103.14.25.211:1719Server address: london:1666Server root: /usr/perforceServer root: /usr/perforceServer date: 2010/06/15 14:55:14 -0800 PSTServer uptime: 384:14:58Server version: P4D/FREEBSD/2010.1/244883...Server license: Perforce Software 200 users...Case Handling: sensitive

Setting server port and client workspace

• Unixsetenv P4PORT neptune:1666

setenv P4CLIENT lisas-jam-dev

• Windowsp4 set P4PORT=neptune:1666

p4 set P4CLIENT=lisas-jam-dev

Using Environment or Registry Variables

Variable Default

• P4CLIENT

• P4PORT

• P4USER

host machine name

perforce:1666

$USER or %USERNAME%

Variable Default

Using command-line flags

• Command syntax

• -p <port> -u <user> -c <clientname>

p4 usageflags

command command flags

filepatterns

p4 -p mars:1666 -u amir -c amir-api client

p4 -c rlo-jam-main sync -n

Using configuration files

• Set P4CONFIG to a file nameSet P4CONFIG to a file name

p4 set P4CONFIG=config.txt

• Place files in client workspace roots

• List environment variables in filesList environment variables in files

P4PORT=lemon:1909

P4CLIENT=graphics_proj

P4CONFIG exampleEnvironment Variables:Environment Variables:P4PORT=perforce:1666P4PORT=perforce:1666P4CLIENT=P4CLIENT=jonjon--jamjam--mainmainP4USER=P4USER=jonjonP4CONFIG=config.txtP4CONFIG=config.txt

C:\Doc\Projects\

P4PORT=tyro:1777P4CLIENT=jon-jamgraph-docs

Jam\MAIN\

Jamgraph\MAIN\

config.txtconfig.txt

fi t tfi t t

P4PORT=pine:1666P4CLIENT=jon-talk-docs

Talkhouse\MAIN\

Configuration order of precedence

• Command-line flags

• P4CONFIG files

• Environment variable settings

• Registry variable settings (on Windows)

• Default environment variable values

Setting a password

• Use p4 passwd to set password on server

• A ‘strong’ password...

• ...is at least eight characters

• ...includes two of:• Upper case charactersUpper case characters• Lower case characters• Non-alphabetic characters

User authentication

• Log in to get a ticketp4 login

• Password use depends on security level:0 or 1 –

Can use environment or registry variable

2 –setenv P4PASSWD password (some UNIX)

p4 -P password <command>

3 –Password-based authentication rejected

Other environment variables

• P4EDITOR , P4DIFF, P4MERGE, ,

• TMP, TEMP, P4TICKETS

• P4CHARSET

• p4 set

• p4 [flags]

• p4 passwd

Labels

About Labels

• Labels vs. Changelist NumbersLabels vs. Changelist Numbers

• Creating a Label

• Tagging Files with a Label

• Static vs. Automatic Labels

• Locking a Label

Labels vs. changelist numbers

U d t i d fil t• User-determined file set

• Can be changed

• Meaningful names

Tagging files with a label (static)

p4 tag -l release1 //depot/Jam/R1.0/...

//depot/Jam/R1.0/svr/jamfile#1 - added//depot/Jam/R1.0/svr/libsvc.c#3 - added//depot/Jam/R1.0/svr/libsvc.h#5 - added//depot/Jam/R1.0/svr/rmtsvc.c#8 - added//depot/Jam/R1.0/svr/rmtsvc.h#2 - added//depot/Jam/R1.0/svr/userhelp.c#4 - added

...etc.

Label: goodbuild

Creating a label specification

p4 label goodbuild

Owner: bob

Description:Build label for development work.

Options: unlocked

View://depot/Jam/MAIN/svr/...//depot/Jam/MAIN/api/...-//depot/Jam/MAIN/api/db/...

Tagging client workspace files (static)

p4 labelsync -l goodbuild

//depot/Jam/MAIN/svr/jamfile#2 - added//depot/Jam/MAIN/svr/libsvc.c#4 - added//depot/Jam/MAIN/svr/libsvc.h#3 - added//depot/Jam/MAIN/svr/rmtsvc.c#6 - added//depot/Jam/MAIN/svr/rmtsvc h#10 - added//depot/Jam/MAIN/svr/rmtsvc.h#10 added//depot/Jam/MAIN/svr/userhelp.c#7 - added

...etc.

Updating files tagged with a label

p4 labelsync -l goodbuild //depot/Jam/MAIN/api/...

p4 labelsync -l goodbuild //depot/Jam/MAIN/api/key.c#7

p4 labelsync -a -l goodbuild //depot/Jam/MAIN/svr/...

p4 labelsync -d -l goodbuild //depot/Jam/MAIN/svr/spec/p4 labelsync -d -l goodbuild //depot/Jam/MAIN/svr/spec/...

Automatic labels

Label: MAIN-build-apr23 10

p4 label MAIN-build-apr23_10Label: MAIN build apr23_10

Owner: bob

Description:April 23, 2010, build file set.

Options: unlocked

Revision: @10357

View://depot/Jam/MAIN/svr/... //depot/Jam/MAIN/api/...

Syncing your client workspace to a label

p4 sync @release1

p4 sync //depot/Jam/R1.0/api/...@release1

p4 sync //depot/Jam/R1.0/svr/rmtsvc.h@release1

Showing files tagged with a label

p4 files @release1

p4 files //depot/Jam/R1.0/api/...@release1

p4 files //depot/Jam/R1.0/svr/libsvc.h@release1

Locking a label

p4 label jam1.0Label: jam1 0Label: jam1.0

Owner: bob

Description:Label for Release 1 - production.

Options: lockedOptions: locked

View://depot/Jam/REL1.0/...

Showing labelsp4 labels –e "jam-*"Label jam-1.1.0 2008/01/09 'Created by earl. '

Label jam-2.0.5 2009/01/01 'Created by earl. 'Label jam 2.0.5 2009/01/01 Created by earl.

Label jam-2.1.0 2009/05/04 'Created by earl. '

Label jam-2.1.0-mac-export 2009/05/06 'Created by earl. '

Label jam-2.2.1 2010/05/03 'Created by bruno. '

...etc.

p4 labels //depot/Jam/MAIN/src/jam.c#1,#20Label jam-1.1.0 2008/01/09 'Created by earl. '

...etc.

• p4 tagp g

• p4 label

• p4 labelsync

• p4 sync @labelname

• p4 files @labelname

• p4 labels

Branching and Integration

Branching and integration

• Inter-File BranchingInter File Branching

• Creating a Branch

• Propagating Changes Between Branches

• Selective Integrations

• Renaming Files

What “integrate” means in Perforce

• Copying a branch to create a new one

• Propagating changes between branches

Creating a branch

//depot/Jam/R1.0/...target

//depot/Jam/MAIN/...source

Integrating by branch specification

• Branch spec view stores source/target pairs• Branch spec view stores source/target pairs

• Integrate using branch spec name

• Create new branch

• Re-use to propagate changes

Creating a branch specification

p4 branch JamMAIN-to-R1.0

Branch: JamMAIN-to-R1.0

Owner: bobDescription:

Jam Release 1.0 branch for Server & APIOptions: unlockedView://d t/J /MAIN/ / //d t/J /R1 0/ ///depot/Jam/MAIN/svr/... //depot/Jam/R1.0/svr/...//depot/Jam/MAIN/api/... //depot/Jam/R1.0/api/...

target pathssource paths

Integration steps (new branch)

• Add target branch to client workspace view

• Open files for integration

• Submit files

Client ben jam

Add target branch to client workspace view

p4 client

Client: ben-jamDescription:

Ben’s Jam client workspace.Root: c:\demoView:

//depot/Jam/MAIN/... //ben-jam/Jam/MAIN/...//d t/J /R1 0/ //b j /J /R1 0///depot/Jam/R1.0/... //ben-jam/Jam/R1.0/...

Put target branchin this list

Creating a new branch using a branch spec

p4 integ -b JamMAIN-to-R1.0

//depot/Jam/R1 0/svr/regexp h#1 - branch/sync//depot/Jam/R1.0/svr/regexp.h#1 - branch/sync from //depot/Jam/MAIN/svr/regexp.h#1,#3

//depot/Jam/R1.0/svr/rules.c#1 - branch/sync from //depot/Jam/MAIN/svr/rules.c#1,#7

//depot/Jam/R1.0/svr/rules.h#1 - branch/sync from //depot/Jam/MAIN/svr/rules.h#1,#4

...etc.

p4 submit...

p4 client

p4 submit

p4 integ -b JamMAIN-to-R1.0

MAIN/svr/xyz.c#6

R1.0/svr/xyz.c#1C:\demo\Jam\R1.0\svr\xyz.c

Propagating changes across branches

Integration steps (propagation)

• Check client workspace viewCheck client workspace view

• Open files for integration

• Resolve

• Submit

Propagating changes using a branch spec

p4 integ -r -b JamMAIN-to-R1.0//depot/Jam/MAIN/api/make.c#4 - integrate from

//depot/Jam/R1.0/api/make.c#2,#3//depot/Jam/MAIN/api/make1.c#7 - integrate from

//depot/Jam/R1.0/api/make1.c#2

p4 resolve...

p4 submit...

p4 submit

R1.0/api/xyz.c#3p4 resolvep4 integ -r -b JamMAIN-to-R1.0

editor“base”“base”

xyz.c“yours”“yours”

R1.0/api/xyz.c#4

xyz.cMAIN/api/xyz.c#8

MAIN/api/xyz.c#9“merged”“merged”

“theirs”“theirs”

Resolving for integrate

Th i S• Theirs = Source

• Yours = Target

• Base = Closest common ancestor

What is the history of a branched file?

p4 filelog -i //depot/Jam/REL2.1/src/hash.c

//depot/Jam/REL2.1/src/hash.c#2 869 2006/10/13 @... #2 change 869 edit on 2006/10/13 by quinn@quinn-integ (text) 'Fixed off-by-one error. '

... #1 change 749 branch on 2004/11/23 by ines@ines-rose (text) 'Create Jam 2.1 release branch. '

... ... branch from //depot/Jam/MAIN/src/hash.c#1,#3//depot/Jam/MAIN/src/hash.c... #3 change 137 edit on 1999/05/02 by earl@earl-dev-

guava (text) 'Get all function declarations. 'guava (text) Get all function declarations. ... ... branch into //depot/Jam/REL2.1/src/hash.c#1... #2 change 30 edit on 1999/01/10 by earl@earl-dev-

guava (text) 'Copyright info. '... ... branch into //depot/Jam/REL2.0/src/hash.c#1... #1 change 1 add on 1998/09/23 by earl@earl-dev-guava

(text) 'Initial revision '

• p4 branchp4 branch

• p4 integ

• p4 filelog -i

Branching and Integration

Intermission!

Branching & Integration Exercises Part 1

Creating a new branch using a file spec

p4 integ //depot/Jam/MAIN/... //depot/Jam/R1.0/...

//depot/Jam/R1.0/src/Regexp.c#1 - branch/sync from //depot/Jam/MAIN/src/regexp.c#1,#2

//depot/Jam/R1.0/src/Regexp.h#1 - branch/sync from //depot/Jam/MAIN/src/regexp.h#1

//depot/Jam/R1.0/src/RELNOTES#1 - branch/sync from //depot/Jam/MAIN/src/RELNOTES#1,#77

etc...etc.

p4 submit...

p4 client

p4 submit

p4 integrate //depot/Jam/MAIN/... //depot/Jam/R1.0/....

MAIN/svr/xyz.c#6

R1.0/svr/xyz.c#1C:\demo\Jam\R1.0\svr\xyz.c

Propagating changes using a file spec

p4 integ //depot/Jam/R1.0/... //depot/Jam/MAIN/...

//d t/J /MAIN/ / k #4 i t t f//depot/Jam/MAIN/src/make.c#4 - integrate from

//depot/Jam/R1.0/src/make.c#2,#3//depot/Jam/MAIN/src/make1.c#7 - integrate from

//depot/Jam/R1.0/src/make1.c#2

p4 resolve...

p4 submit...

p4 submitR1.0/api/xyz.c#3

p4 resolve

p4 integ //depot/Jam/R1.0/... //depot/Jam/MAIN/...

editor “base”“base”

xyz.c“yours”“yours”

R1.0/api/xyz.c#4

xyz.cMAIN/api/xyz.c#8

MAIN/api/xyz.c#9“merged”“merged”

“theirs”“theirs”

What changelists have been integrated?

p4 changes -i //depot/Jam/R1.0/...

Change 5047 on 2008/12/29 by bob@bob-jam 'Create release branch'

Change 5028 on 2008/12/23 by baron@baron-bios 'Upgrade to latest metrowerks on'

Change 5026 on 2008/12/22 by jean@jean-spice 'Added all the old press release'

Change 5025 on 2008/12/22 by jean@jean-spiceChange 5025 on 2008/12/22 by jean@jean spice 'Press releases now just use standard'

Change 5014 on 2008/12/19 by berger@berger-spice 'Put in fix for jam's NT handle '

...etc.

Introduction to Perforce for Users · Perforce Training Course, 2010.1 2 Course Contents •...

Documents

P4 perforce

Techlog 2010.1 Conventional Log Analysis O

Perforce 2005.2 Introducing Perforce · 2005-12-14 · How Perforce Works 8 Perforce 2005.2 Introducing Perforce Client workspace views consist of one or more lines, or mappings.Each

Kidney pathology 2010.1 Tubular & interstitial diseases

P4Convert: User Guide - Perforceftp.perforce.com/perforce/tools/p4convert/p4convert.pdf · into a Perforce changelist. Using this method will produce a one-to-one mapping of Subversion

Perforce 2005.2 P4 User’s Guide started with Perforce.....13 Perforce documentation.....14 Please give us feedback .....14 ... P4V, the cross-platform Perforce Visual Client Getting

Luxury Wool - Edition 2010.1

[Paris merge world tour] Perforce Introducing Perforce Insights

Perforce Software

Michelle Beauvais Portfolio 2010.1

Perforce Load Testing -Perforce Load Testing -AAgendagenda

Sample of a printed user's guide - Lori Kaufmantechwriter.lorikaufman.com/samples/using_fogbugz_for_bug_tracking.pdf · See Associating a bug with a Perforce changelist on page 7

Rele Notes 2010.1

September 2010.1

P4V User Guide - Perforce · 2020-04-13 · Contents What's new in this guide by release 10 2020.1 10 Large changelist area within dialog box 10 Graph Depot features 10 Edit recent

Introducing Perforce Git Fusion · 2017-07-18 · Introducing Perforce Git Fusion Perforce Software Sept 2012 PLEASE NOTE: This information is embargoed until October 2, 2012. Perforce

CHEAT SHEET - Perforce · HELIX COMMAND-LINE CLIENT (P4) CHEAT SHEET Develop p4 add Open a new file to add it to the depot p4 change Create or edit a changelist description p4 changes

Perforce Performance

Hands-Free Server Discovery: Perforce and Zero ......Hands-Free Server Discovery: Perforce and Zero-Configuration Networking Michael Bishop, Perforce Software Perforce and Zeroconf

Comparison: Perforce and Microsoft Team Foundation Server ... · Comparison: Perforce and Microsoft Team Foundation Server (TFS) 5 Perforce Basic Branching and Merging The Perforce