Perforce hints
--------------

More reading:
	http://people.freebsd.org/~peter/p4cookbook.txt
	http://people.freebsd.org/~scottl/p4-primer.txt

o Requisites:

% p4 client

Client: maxim_sonnie
[...]
Root:   /home/maxim/code/p4.freebsd
[...]
View:
        //depot/user/maxim/wip/... //maxim_sonnie/wip/...
	//depot/vendor/freebsd/src/... //maxim_sonnie/freebsd/...

o Integrate changes from "parent" branch to maxim_wip branch:

% cd ~/code/p4.freebsd/wip/
% p4 integ -b maxim_wip
% p4 resolve -a			# Resolve automatically
% p4 resolve			# Resolve by hands
% p4 submit			# Submit changes

Remember, p4 does not delete files which were deleted from the "parent"
branch automatically.  You need to do something like that:

% p4 integ -d -b maxim_wip

o Make changes:

% cd ~/code/p4.freebsd/wip/
% p4 edit UPDATING
% vi UPDATING
% p4 diff -du UPDATING		# Check the changes
% p4 revert			# Undo them
% vi UPDATING
% p4 diff -du UPDATING		# They are OK now

o Submit changes:

% p4 submit

OR (from gorgon@):

% p4 changelist
... edit log message, save...
% p4 submit -c 62439		# where 62439 is the changelist number
				# that is printed after you save
				# the changelist description.

OR:

% cat changelist.form | p4 submit -i

Of course, you have to have everything filled out correctly (including
the list of files).  Fortunately, that's relatively  easy to do:

% p4 change -o | sed 's/<enter description here>/real description/' |\
    p4 submit -i

o Generate a diff between "parent" branch and maxim_wip branch:

% cd ~/code/p4.freebsd/
% makediff.pl //depot/vendor/freebsd/src/... wip/...

Or (since I have freebsd mapped to my view):

% makediff.pl freebsd/... wip/...

# EOF