From owner-svn-doc-all@FreeBSD.ORG Tue Apr 29 21:49:09 2014 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 22755369; Tue, 29 Apr 2014 21:49:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0E9531D57; Tue, 29 Apr 2014 21:49:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3TLn8qk057363; Tue, 29 Apr 2014 21:49:08 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3TLn86g057362; Tue, 29 Apr 2014 21:49:08 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201404292149.s3TLn86g057362@svn.freebsd.org> From: Warren Block Date: Tue, 29 Apr 2014 21:49:08 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r44712 - head/en_US.ISO8859-1/articles/p4-primer X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Apr 2014 21:49:09 -0000 Author: wblock Date: Tue Apr 29 21:49:08 2014 New Revision: 44712 URL: http://svnweb.freebsd.org/changeset/doc/44712 Log: Restore lost tags. Modified: head/en_US.ISO8859-1/articles/p4-primer/article.xml Modified: head/en_US.ISO8859-1/articles/p4-primer/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/p4-primer/article.xml Tue Apr 29 21:44:04 2014 (r44711) +++ head/en_US.ISO8859-1/articles/p4-primer/article.xml Tue Apr 29 21:49:08 2014 (r44712) @@ -104,8 +104,8 @@ and P4PASSWD variables be set. Use the username and password from above, like so: - &prompt.user; export P4USER=username -&prompt.user; export P4PASSWD=password + &prompt.user; export P4USER=username +&prompt.user; export P4PASSWD=password Test that this works by running the following command: @@ -145,7 +145,7 @@ you want, but it must be unique within the Perforce server. A naming convention that is commonly used is - username_machinename, + username_machinename, which makes it easy to identify clients when browsing them. A default name will be filled in that is just the machine name. @@ -252,14 +252,14 @@ Existing clients can be listed via the p4 clients command. They can be viewed without being modified via the p4 client -o - clientname command. + clientname command. Whenever you are interacting with files in Perforce, the P4CLIENT environment variable must be set to the name of the client that you are using, like so: - &prompt.user; export P4CLIENT=myclientname + &prompt.user; export P4CLIENT=myclientname Note that client mappings in the repository are not exclusive; multiple clients can map in the same part of the repository. This @@ -296,7 +296,7 @@ smpng project, you might do the following: - &prompt.user; cd projectroot/smpng + &prompt.user; cd projectroot/smpng &prompt.user; p4 sync src/sys/ufs/... Specifying a local relative path works for many other @@ -334,7 +334,7 @@ The first step to creating a branch is to create a branch specification. This is similar to a client specification, but is created via the command p4 branch - branchname. + branchname. The following important fields are explained: @@ -418,7 +418,7 @@ The common way to do an integration is with the following command: - &prompt.user; p4 integrate -b branchname + &prompt.user; p4 integrate -b branchname branchname is the name given to a branch spec, as discussed in the previous section. This command @@ -521,7 +521,7 @@ To open a file for editing, use the p4 edit command like so: - &prompt.user; p4 edit filename + &prompt.user; p4 edit filename This marks the file on the server as being in the edit state, which then allows it to be submitted after changes are made, or @@ -545,7 +545,7 @@ your changes and revert it to its original state, run the p4 revert command like so: - &prompt.user; p4 revert filename + &prompt.user; p4 revert filename This resyncs the file to the contents of the server, and removes the edit attribute from the server. Any local changes @@ -571,7 +571,7 @@ will provide a brief description of each change, who made the change, and what its change number was. A change can be examined in detail via the p4 describe - changenumber command. This + changenumber command. This will provide the submit log and the diffs of the actual change. Commonly, the p4 describe command is used in one @@ -579,7 +579,7 @@ - p4 describe -s CHANGE + p4 describe -s CHANGE List a short description of @@ -589,7 +589,7 @@ - p4 describe -du CHANGE + p4 describe -du CHANGE List a description of changeset CHANGE, @@ -601,7 +601,7 @@ - p4 describe -dc CHANGE + p4 describe -dc CHANGE List a description of changeset CHANGE, @@ -614,7 +614,7 @@ The p4 filelog - filename command will show + filename command will show the history of a file, including all submits, integrations, and branches of it. @@ -654,11 +654,11 @@ flags do work. The two forms of this command are: - &prompt.user; p4 diff2 -b branchname + &prompt.user; p4 diff2 -b branchname and - &prompt.user; p4 diff2 //depot/path1 //depot/path2 + &prompt.user; p4 diff2 //depot/path1 //depot/path2 @@ -684,7 +684,7 @@ Adding files is easily done be creating the file and then running the p4 add command like so: - &prompt.user; p4 add filename + &prompt.user; p4 add filename If you want to add a whole tree of files, run a command like: @@ -709,7 +709,7 @@ Removing a file is just as easy with the p4 delete command like so: - &prompt.user; p4 delete filename + &prompt.user; p4 delete filename This will mark the file for deletion from the depot the next time that a submit is run. It will also remove the local copy of @@ -774,9 +774,9 @@ dealing with this is to do a one-time, in-tree integration, like so: - &prompt.user; p4 integrate -i oldfile newfile + &prompt.user; p4 integrate -i oldfile newfile &prompt.user; p4 resolve -&prompt.user; p4 delete oldfile +&prompt.user; p4 delete oldfile &prompt.user; p4 submit The integration will force Perforce @@ -847,16 +847,16 @@ - //depot/projects/soc2005/project-name/... + //depot/projects/soc2005/project-name/... - //depot/projects/soc2006/project-name/... + //depot/projects/soc2006/project-name/... - //depot/projects/soc2007/project-name/... + //depot/projects/soc2007/project-name/... - //depot/projects/soc2008/project-name/... + //depot/projects/soc2008/project-name/...