Perforce - Revision history

Pchero: /* client */

2017-07-13T10:20:12Z

client

← Older revision		Revision as of 10:20, 13 July 2017
Line 285:		Line 285:
	View:		View:
	//depot/devel/helloworld/... //stk_pbxdevelopment/depot/devel/helloworld/...		//depot/devel/helloworld/... //stk_pbxdevelopment/depot/devel/helloworld/...
			-//depot/devel/helloworld_ignore/... //stk_pbxdevelopment/depot/devel/helloworld/...
	</pre>		</pre>

2017-04-24T12:59:14Z

help

← Older revision		Revision as of 12:59, 24 April 2017
Line 137:		Line 137:
	submit Submit open files to the depot		submit Submit open files to the depot
	revert Revert open files and restore originals to workspace		revert Revert open files and restore originals to workspace
			</pre>

			=== add ===
			파일을 추가한다.

			주의할 점은 디렉토리를 추가하지는 못한다는 점이다. 그리고 하위 디렉토리를 추가하지도 못한다. 하위 디렉토리를 추가하기 위해서는 pipe 를 이용한 명령어 조합을 사용해야 한다.
			<pre>
			p4 add [-c changelist#] [-d -f -I -n] [-t filetype] file ...
	</pre>		</pre>

2016-12-19T11:09:57Z

sync, flush, update

← Older revision		Revision as of 11:09, 19 December 2016
Line 368:		Line 368:
	* flush : sync -k		* flush : sync -k
	* update : sync -s		* update : sync -s

			==== -f ====
			강제로 파일들을 서버와 동기화 시킨다. 단, open 되어 있는 파일에는 동기화를 시도하지 않는다.
			<pre>
			The -f flag forces resynchronization even if the client already
			has the file, and overwriting any writable files. This flag doesn't
			affect open files.
			</pre>

	=== copy ===		=== copy ===

2016-12-19T10:48:23Z

interchanges

← Older revision		Revision as of 10:48, 19 December 2016
Line 404:		Line 404:

	=== interchanges ===		=== interchanges ===
			두 개의 브랜치 사이에서의 다른 점을 확인한다. 이미 integrated 된 브랜치인지 아닌지를 확인할 때 사용한다.

	<pre>		<pre>
	interchanges -- Report changes not yet integrated		interchanges -- Report changes not yet integrated

2016-12-19T10:36:11Z

interchanges

← Older revision		Revision as of 10:36, 19 December 2016
Line 413:		Line 413:

	options: -f -l -r -t -b -s -S -P -F		options: -f -l -r -t -b -s -S -P -F
			</pre>

			'''Example'''
			<pre>
			[pchero@pluto]$ p4 interchanges FEATURE_History -r
			FEATURE_History - all revision(s) already integrated.

			[pchero@pluto]$ p4 interchanges BUG_wrong_cdr_chaneel/... DEVELOP/...
			wrong_cdr_chaneel/... - all revision(s) already integrated.
	</pre>		</pre>

2016-12-19T10:24:32Z

describe

@@ Line 401: / Line 401: @@
 ... //depot/devel/test/Makefile.inc#2 delete
 ... //depot/devel/test/sample_module/Makefile#2 delete
 </pre>

2016-08-29T08:26:51Z

integrate

← Older revision		Revision as of 08:26, 29 August 2016
Line 171:		Line 171:

	=== integrate ===		=== integrate ===
	~~integrate -- Integrate one set of files into another~~		Branch/File 간의 merge 를 한다.

	<pre>		<pre>
Line 178:		Line 178:
	$ p4 integrate [options] -b branch -s fromFile[revRange] [toFile ...]		$ p4 integrate [options] -b branch -s fromFile[revRange] [toFile ...]
	$ p4 integrate [options] -S stream [-r] [-P parent] [file[revRange] ...]		$ p4 integrate [options] -S stream [-r] [-P parent] [file[revRange] ...]
			</pre>

			=== resolve ===
			Integrate 이후의 merge 충돌 오류를 해결한다.

			<pre>
			p4 resolve [options] [file ...]
	</pre>		</pre>

2016-08-29T08:20:19Z

change, changelist

@@ Line 281: / Line 281: @@
 p4 change -t restricted | public [-U user] [-f | -u | -O] changelist#
 p4 change -U user [-t restricted | public] [-f] changelist#
 </pre>

2016-08-16T13:17:32Z

describe

← Older revision		Revision as of 13:17, 16 August 2016
Line 359:		Line 359:

	p4 describe [-d<flags> -m -s -S -f -O] changelist# ...		p4 describe [-d<flags> -m -s -S -f -O] changelist# ...
			</pre>

			'''Example'''
			<pre>
			$ p4 describe 3447
			Change 3447 by pchero@my_dev on 2016/08/15 15:03:12

			Not in use BRANCH

			Affected files ...

			... //depot/devel/test/Makefile#2 delete
			... //depot/devel/test/Makefile.inc#2 delete
			... //depot/devel/test/sample_module/Makefile#2 delete
	</pre>		</pre>

2016-08-16T12:49:20Z

Change the client(workspace) name

← Older revision		Revision as of 12:49, 16 August 2016
Line 370:		Line 370:
	How do I rename a client workspace?		How do I rename a client workspace?
	Solution		Solution
	Perforce does not provide a rename mechanism for client workspaces. However, if a user does not have any files checked out the following procedure can be used to create a new workspace using the same specifications as the old one and update the server's meta data.		Perforce does not provide a rename mechanism for client workspaces.
			However, if a user does not have any files checked out the following procedure can be used to create a new
			workspace using the same specifications as the old one and update the server's meta data.

	1. Use the old workspace as a template to create a new one.		1. Use the old workspace as a template to create a new one.