Helix SwarmHelix Swarm
Loading...

glossary.html

  • //
  • guest/
  • nrkruk/
  • p4eclipse/
  • 2015-1/
  • src/
  • 3.7/
  • plugins/
  • com.perforce.team.help.ui/
  • topics/
  • glossary.html #1
  • View
  • Commits
  • Open Download .zip Download (45 KB) 
  1. <!doctype html public "-//w3c//dtd html 3.2 final//en">
  2. <html>
  3. <head>
  4. <title>Glossary of Perforce Terminology</title>
  5. <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  6. <link rel="stylesheet" type="text/css" href="perforcehelp.css">
  7. </head>
  8.  
  9. <body>
  10. <h1>Glossary of Perforce Terminology</h1>
  11. <table>
  12.   <TR> 
  13.     <TH width="232"> 
  14.       <div align="left"><STRONG>Term</STRONG>
  15.       </div>
  16.     </TH>
  17.     <TH width="871"> 
  18.       <div align="left"><STRONG>Definition</STRONG>
  19.       </div>
  20.     </TH>
  21.   <TR> 
  22.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051603></A> </tt> 
  23.       </font> 
  24.       <P><font size="+1"><tt>access level </tt></font></P>
  25.     </TD>
  26.     <TD vAlign=top width="871"><A name=1051606></A> 
  27.       <P>A permission assigned to a user to control which Perforce commands the 
  28.         user can execute. See <A 
  29.       href="#1052071"><EM>protections</EM></A>. </P>
  30.     </TD>
  31.   <TR> 
  32.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1071025></A> </tt> 
  33.       </font> 
  34.       <P><font size="+1"><tt>admin access </tt></font></P>
  35.     </TD>
  36.     <TD vAlign=top width="871"><A name=1071027></A> 
  37.       <P>An access level that gives the user permission to run Perforce commands 
  38.         that override <A 
  39.       href="#1052010"><EM>metadata</EM></A>, but do not affect the state of the 
  40.         server. </P>
  41.     </TD>
  42.   <TR> 
  43.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051611></A> </tt> 
  44.       </font> 
  45.       <P><font size="+1"><tt>apple file type </tt></font></P>
  46.     </TD>
  47.     <TD vAlign=top width="871"><A name=1051613></A> 
  48.       <P>Perforce file type assigned to Macintosh files that are stored using 
  49.         AppleSingle format, permitting the data fork and resource fork to be stored 
  50.         as a single file. </P>
  51.     </TD>
  52.   <TR> 
  53.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051615></A> </tt> 
  54.       </font> 
  55.       <P><font size="+1"><tt>atomic change transaction </tt></font></P>
  56.     </TD>
  57.     <TD vAlign=top width="871"><A name=1051618></A> 
  58.       <P>Grouping operations affecting a number of files in a single transaction. 
  59.         If all operations in the transaction succeed, all the files are updated. 
  60.         If any operation in the transaction fails, none of the files are updated. 
  61.       </P>
  62.     </TD>
  63.   <TR> 
  64.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051620></A> </tt> 
  65.       </font> 
  66.       <P><font size="+1"><tt>base </tt></font></P>
  67.     </TD>
  68.     <TD vAlign=top width="871"><A name=1051623></A> 
  69.       <P>The file revision on which two newer, conflicting file revisions are 
  70.         based. </P>
  71.     </TD>
  72.   <TR> 
  73.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051626></A> </tt> 
  74.       </font> 
  75.       <P><font size="+1"><tt>binary file type </tt></font></P>
  76.     </TD>
  77.     <TD vAlign=top width="871"><A name=1051628></A> 
  78.       <P>Perforce file type assigned to a non-text file. By default, the contents 
  79.         of each revision are stored in full and the file is stored in compressed 
  80.         format. </P>
  81.     </TD>
  82.   <TR> 
  83.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051631></A> </tt> 
  84.       </font> 
  85.       <P><font size="+1"><tt>branch </tt></font></P>
  86.     </TD>
  87.     <TD vAlign=top width="871"><A name=1051634></A> 
  88.       <P>(<EM>noun</EM>) A codeline created by copying another codeline, as opposed 
  89.         to a codeline that was created by adding original files. <A 
  90.       href="#1051631"><EM>branch</EM></A> is often used as a synonym for <A 
  91.       href="#1051648"><EM>branch view</EM></A>. <A name=1051641></A> 
  92.       <P>(<EM>verb</EM>) To create a codeline branch with <KBD>p4 integrate</KBD>. 
  93.       </P>
  94.     </TD>
  95.   <TR> 
  96.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051643></A> </tt> 
  97.       </font> 
  98.       <P><font size="+1"><tt>branch form </tt></font></P>
  99.     </TD>
  100.     <TD vAlign=top width="871"><A name=1051645></A> 
  101.       <P>The Perforce form you use to modify a branch. </P>
  102.     </TD>
  103.   <TR> 
  104.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052316></A> </tt> 
  105.       </font> 
  106.       <P><font size="+1"><tt>branch specification </tt></font></P>
  107.     </TD>
  108.     <TD vAlign=top width="871"><A name=1052348></A> 
  109.       <P>Specifies how a branch is to be created by defining the location of the 
  110.         original codeline and the branch. The branch specification is used by 
  111.         the integration process to create and update branches. Client workspaces, 
  112.         labels, and branch specifications cannot share the same name. </P>
  113.     </TD>
  114.   <TR> 
  115.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051648></A> </tt> 
  116.       </font> 
  117.       <P><font size="+1"><tt>branch view </tt></font></P>
  118.     </TD>
  119.     <TD vAlign=top width="871"><A name=1051651></A> 
  120.       <P>A specification of the branching relationship between two codelines in 
  121.         the depot. Each branch view has a unique name, and defines how files are 
  122.         mapped from the originating codeline to the target codeline. See <A 
  123.       href="#1051631"><EM>branch</EM></A>. </P>
  124.     </TD>
  125.   <TR> 
  126.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051664></A> </tt> 
  127.       </font> 
  128.       <P><font size="+1"><tt>changelist </tt></font></P>
  129.     </TD>
  130.     <TD vAlign=top width="871"><A name=1051666></A> 
  131.       <P>An atomic change transaction in Perforce. The changes specified in the 
  132.         changelist are not stored in the depot until the changelist is submitted 
  133.         to the depot. </P>
  134.     </TD>
  135.   <TR> 
  136.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051668></A> </tt> 
  137.       </font> 
  138.       <P><font size="+1"><tt>changelist form </tt></font></P>
  139.     </TD>
  140.     <TD vAlign=top width="871"><A name=1051670></A> 
  141.       <P>The Perforce form you use to modify a changelist. </P>
  142.     </TD>
  143.   <TR> 
  144.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051672></A> </tt> 
  145.       </font> 
  146.       <P><font size="+1"><tt>changelist <BR>
  147.         number </tt></font></P>
  148.     </TD>
  149.     <TD vAlign=top width="871"><A name=1051675></A> 
  150.       <P>The unique numeric identifier of a changelist. </P>
  151.     </TD>
  152.   <TR> 
  153.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051678></A> </tt> 
  154.       </font> 
  155.       <P><font size="+1"><tt>change review </tt></font></P>
  156.     </TD>
  157.     <TD vAlign=top width="871"><A name=1051681></A> 
  158.       <P>The process of sending email to users who have registered their interest 
  159.         in changes made to specified files in the depot. </P>
  160.     </TD>
  161.   <TR> 
  162.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051683></A> </tt> 
  163.       </font> 
  164.       <P><font size="+1"><tt>checkpoint </tt></font></P>
  165.     </TD>
  166.     <TD vAlign=top width="871"><A name=1051686></A> 
  167.       <P>A copy of the underlying server metadata at a particular moment in time. 
  168.         See <A 
  169.       href="#1052010"><EM>metadata</EM></A>. </P>
  170.     </TD>
  171.   <TR> 
  172.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051695></A> </tt> 
  173.       </font> 
  174.       <P><font size="+1"><tt>client form </tt></font></P>
  175.     </TD>
  176.     <TD vAlign=top width="871"><A name=1051697></A> 
  177.       <P>The Perforce form you use to define a client workspace. </P>
  178.     </TD>
  179.   <TR> 
  180.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051699></A> </tt> 
  181.       </font> 
  182.       <P><font size="+1"><tt>client name </tt></font></P>
  183.     </TD>
  184.     <TD vAlign=top width="871"><A name=1051701></A> 
  185.       <P>A name that uniquely identifies the current client workspace. </P>
  186.     </TD>
  187.   <TR> 
  188.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051703></A> </tt> 
  189.       </font> 
  190.       <P><font size="+1"><tt>client root </tt></font></P>
  191.     </TD>
  192.     <TD vAlign=top width="871"><A name=1051706></A> 
  193.       <P>The root directory of a client workspace. If two or more client workspaces 
  194.         are located on one machine, they cannot share a root directory. </P>
  195.     </TD>
  196.   <TR> 
  197.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051708></A> </tt> 
  198.       </font> 
  199.       <P><font size="+1"><tt>client side </tt></font></P>
  200.     </TD>
  201.     <TD vAlign=top width="871"><A name=1051711></A> 
  202.       <P>The right-hand side of a mapping within a client view, specifying where 
  203.         the corresponding depot files are located in the client workspace. </P>
  204.     </TD>
  205.   <TR> 
  206.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051714></A> </tt> 
  207.       </font> 
  208.       <P><font size="+1"><tt>client view </tt></font></P>
  209.     </TD>
  210.     <TD vAlign=top width="871"><A name=1051717></A> 
  211.       <P>A set of mappings that specifies the correspondence between file locations 
  212.         in the depot and the client workspace. </P>
  213.     </TD>
  214.   <TR> 
  215.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051720></A> </tt> 
  216.       </font> 
  217.       <P><font size="+1"><tt>client workspace </tt></font></P>
  218.     </TD>
  219.     <TD vAlign=top width="871"><A name=1051722></A> 
  220.       <P>Directories on the client computer where you work on file revisions that 
  221.         are managed by Perforce. By default this name is set to the name of the 
  222.         host machine on which the client workspace is located; to override the 
  223.         default name, set the <KBD>P4CLIENT</KBD> environment variable. Client 
  224.         workspaces, labels, and branch specifications cannot share the same name. 
  225.       </P>
  226.     </TD>
  227.   <TR> 
  228.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051725></A> </tt> 
  229.       </font> 
  230.       <P><font size="+1"><tt>codeline </tt></font></P>
  231.     </TD>
  232.     <TD vAlign=top width="871"><A name=1051728></A> 
  233.       <P>A set of files that evolve collectively. One codeline can be branched 
  234.         from another, allowing each set of files to evolve separately. </P>
  235.     </TD>
  236.   <TR> 
  237.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051731></A> </tt> 
  238.       </font> 
  239.       <P><font size="+1"><tt>conflict </tt></font></P>
  240.     </TD>
  241.     <TD vAlign=top width="871"><A name=1051733></A> 
  242.       <P>One type of conflict occurs when two users open a file for edit. One 
  243.         user submits the file; after which the other user can't submit because 
  244.         of a conflict. The cause of this type of conflict is two users opening 
  245.         the same file. <A name=1051734></A> 
  246.       <P>The other type of conflict is when users try to merge one file into another. 
  247.         This type of conflict occurs when the comparison of two files to a common 
  248.         base yields different results, indicating that the files have been changed 
  249.         in different ways. In this case, the merge can't be done automatically 
  250.         and must be done by hand. The type of conflict is caused by non-matching 
  251.         <A 
  252.       href="#1051800"><EM>diff</EM></A>s. <A name=1051741></A> 
  253.       <P>See <A 
  254.       href="#1051829"><EM>file conflict</EM></A>. </P>
  255.     </TD>
  256.   <TR> 
  257.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051743></A> </tt> 
  258.       </font> 
  259.       <P><font size="+1"><tt>counter </tt></font></P>
  260.     </TD>
  261.     <TD vAlign=top width="871"><A name=1051746></A> 
  262.       <P>A numeric variable used by Perforce to track changelist numbers in conjunction 
  263.         with the review feature. </P>
  264.     </TD>
  265.   <TR> 
  266.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051748></A> </tt> 
  267.       </font> 
  268.       <P><font size="+1"><tt>default changelist </tt></font></P>
  269.     </TD>
  270.     <TD vAlign=top width="871"><A name=1051750></A> 
  271.       <P>The changelist used by Perforce commands, unless a numbered changelist 
  272.         is specified. A default pending changelist is created automatically when 
  273.         a file is opened for edit. </P>
  274.     </TD>
  275.   <TR> 
  276.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051753></A> </tt> 
  277.       </font> 
  278.       <P><font size="+1"><tt>default depot </tt></font></P>
  279.     </TD>
  280.     <TD vAlign=top width="871"><A name=1051756></A> 
  281.       <P>The depot name that is assumed when no name is specified. The default 
  282.         depot name is <KBD>depot</KBD>. </P>
  283.     </TD>
  284.   <TR> 
  285.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051758></A> </tt> 
  286.       </font> 
  287.       <P><font size="+1"><tt>deleted file </tt></font></P>
  288.     </TD>
  289.     <TD vAlign=top width="871"><A name=1051760></A> 
  290.       <P>In Perforce, a file with its head revision marked as deleted. Older revisions 
  291.         of the file are still available. </P>
  292.     </TD>
  293.   <TR> 
  294.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051762></A> </tt> 
  295.       </font> 
  296.       <P><font size="+1"><tt>delta </tt></font></P>
  297.     </TD>
  298.     <TD vAlign=top width="871"><A name=1051765></A> 
  299.       <P>The differences between two files. </P>
  300.     </TD>
  301.   <TR> 
  302.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051775></A> </tt> 
  303.       </font> 
  304.       <P><font size="+1"><tt>depot </tt></font></P>
  305.     </TD>
  306.     <TD vAlign=top width="871"><A name=1051778></A> 
  307.       <P>A file repository on the Perforce server. It contains all versions of 
  308.         all files ever submitted to the server. There can be multiple depots on 
  309.         a single server. </P>
  310.     </TD>
  311.   <TR> 
  312.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051780></A> </tt> 
  313.       </font> 
  314.       <P><font size="+1"><tt>depot root </tt></font></P>
  315.     </TD>
  316.     <TD vAlign=top width="871"><A name=1051782></A> 
  317.       <P>The root directory for a depot. </P>
  318.     </TD>
  319.   <TR> 
  320.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051784></A> </tt> 
  321.       </font> 
  322.       <P><font size="+1"><tt>depot side </tt></font></P>
  323.     </TD>
  324.     <TD vAlign=top width="871"><A name=1051787></A> 
  325.       <P>The left side of any client view mapping, specifying the location of 
  326.         files in a depot. </P>
  327.     </TD>
  328.   <TR> 
  329.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051789></A> </tt> 
  330.       </font> 
  331.       <P><font size="+1"><tt>depot syntax </tt></font></P>
  332.     </TD>
  333.     <TD vAlign=top width="871"><A name=1051792></A> 
  334.       <P>Perforce syntax for specifying the location of files in the depot. </P>
  335.     </TD>
  336.   <TR> 
  337.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051794></A> </tt> 
  338.       </font> 
  339.       <P><font size="+1"><tt>detached </tt></font></P>
  340.     </TD>
  341.     <TD vAlign=top width="871"><A name=1051797></A> 
  342.       <P>A client computer that cannot connect to a Perforce server. </P>
  343.     </TD>
  344.   <TR> 
  345.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051800></A> </tt> 
  346.       </font> 
  347.       <P><font size="+1"><tt>diff </tt></font></P>
  348.     </TD>
  349.     <TD vAlign=top width="871"><A name=1051805></A> 
  350.       <P>A set of lines that don't match when two files are compared. A <A 
  351.       href="#1051731"><EM>conflict</EM></A> is a pair of unequal diffs between 
  352.         each of two files and a common third file. </P>
  353.     </TD>
  354.   <TR> 
  355.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051814></A> </tt> 
  356.       </font> 
  357.       <P><font size="+1"><tt>donor file </tt></font></P>
  358.     </TD>
  359.     <TD vAlign=top width="871"><A name=1051817></A> 
  360.       <P>The file from which changes are taken when propagating changes from one 
  361.         file to another. </P>
  362.     </TD>
  363.   <TR> 
  364.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051819></A> </tt> 
  365.       </font> 
  366.       <P><font size="+1"><tt>exclusionary mapping </tt></font></P>
  367.     </TD>
  368.     <TD vAlign=top width="871"><A name=1051822></A> 
  369.       <P>A view mapping that excludes specific files. </P>
  370.     </TD>
  371.   <TR> 
  372.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051824></A> </tt> 
  373.       </font> 
  374.       <P><font size="+1"><tt>exclusionary access </tt></font></P>
  375.     </TD>
  376.     <TD vAlign=top width="871"><A name=1051826></A> 
  377.       <P>A permission that denies access to the specified files. </P>
  378.     </TD>
  379.   <TR> 
  380.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051829></A> </tt> 
  381.       </font> 
  382.       <P><font size="+1"><tt>file conflict </tt></font></P>
  383.     </TD>
  384.     <TD vAlign=top width="871"><A name=1051831></A> 
  385.       <P>In a three-way file merge, a situation in which two revisions of a file 
  386.         differ from each other and from their base file. <A name=1051833></A> 
  387.       <P>Also: an attempt to submit a file that is not an edit of the head revision 
  388.         of the file in the depot; typically occurs when another user opens the 
  389.         file for edit after you have opened the file for edit. </P>
  390.     </TD>
  391.   <TR> 
  392.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051835></A> </tt> 
  393.       </font> 
  394.       <P><font size="+1"><tt>file pattern </tt></font></P>
  395.     </TD>
  396.     <TD vAlign=top width="871"><A name=1051837></A> 
  397.       <P>Perforce command line syntax that enables you to specify files 
  398.         using wildcards. </P>
  399.     </TD>
  400.   <TR> 
  401.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051839></A> </tt> 
  402.       </font> 
  403.       <P><font size="+1"><tt>file repository </tt></font></P>
  404.     </TD>
  405.     <TD vAlign=top width="871"><A name=1051842></A> 
  406.       <P>The master copy of all files; shared by all users. In Perforce, this 
  407.         is called the <A 
  408.       href="#1051775"><EM>depot</EM></A>. </P>
  409.     </TD>
  410.   <TR> 
  411.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051848></A> </tt> 
  412.       </font> 
  413.       <P><font size="+1"><tt>file revision </tt></font></P>
  414.     </TD>
  415.     <TD vAlign=top width="871"><A name=1051851></A> 
  416.       <P>A specific version of a file within the depot. Each revision is assigned 
  417.         a number, in sequence. Any revision can be accessed in the depot by its 
  418.         revision number, for example: <KBD>testfile#3</KBD>. </P>
  419.     </TD>
  420.   <TR> 
  421.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051853></A> </tt> 
  422.       </font> 
  423.       <P><font size="+1"><tt>file tree </tt></font></P>
  424.     </TD>
  425.     <TD vAlign=top width="871"><A name=1051855></A> 
  426.       <P>All the subdirectories and files under a given root directory. </P>
  427.     </TD>
  428.   <TR> 
  429.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051857></A> </tt> 
  430.       </font> 
  431.       <P><font size="+1"><tt>file type </tt></font></P>
  432.     </TD>
  433.     <TD vAlign=top width="871"><A name=1051859></A> 
  434.       <P>An attribute that determines how Perforce stores and diffs a particular 
  435.         file. Examples of file types are <KBD>text</KBD> and <KBD>binary</KBD>. 
  436.       </P>
  437.     </TD>
  438.   <TR> 
  439.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051861></A> </tt> 
  440.       </font> 
  441.       <P><font size="+1"><tt>fix </tt></font></P>
  442.     </TD>
  443.     <TD vAlign=top width="871"><A name=1051864></A> 
  444.       <P>A job that has been linked to a changelist. </P>
  445.     </TD>
  446.   <TR> 
  447.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051866></A> </tt> 
  448.       </font> 
  449.       <P><font size="+1"><tt>form </tt></font></P>
  450.     </TD>
  451.     <TD vAlign=top width="871"><A name=1051868></A> 
  452.       <P>Screens displayed by certain Perforce commands. For example, you use 
  453.         the Perforce change form to enter comments about a particular changelist 
  454.         and to verify the affected files. </P>
  455.     </TD>
  456.   <TR> 
  457.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051870></A> </tt> 
  458.       </font> 
  459.       <P><font size="+1"><tt>full-file <BR>
  460.         storage </tt></font></P>
  461.     </TD>
  462.     <TD vAlign=top width="871"><A name=1051873></A> 
  463.       <P>The method by which Perforce stores revisions of binary files in the 
  464.         depot: every file revision is stored in full. Contrast this with <A 
  465.       href="#1052107"><EM>reverse delta storage</EM></A>, which Perforce uses 
  466.         for <KBD>text</KBD> files. </P>
  467.     </TD>
  468.   <TR> 
  469.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051878></A> </tt> 
  470.       </font> 
  471.       <P><font size="+1"><tt>get </tt></font></P>
  472.     </TD>
  473.     <TD vAlign=top width="871"><A name=1051883></A> 
  474.       <P>An obsolete Perforce term: replaced by <A 
  475.       href="#1052192"><EM>sync</EM></A>. </P>
  476.     </TD>
  477.   <TR> 
  478.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051885></A> </tt> 
  479.       </font> 
  480.       <P><font size="+1"><tt>group </tt></font></P>
  481.     </TD>
  482.     <TD vAlign=top width="871"><A name=1051888></A> 
  483.       <P>A list of Perforce users. </P>
  484.     </TD>
  485.   <TR> 
  486.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051890></A> </tt> 
  487.       </font> 
  488.       <P><font size="+1"><tt>have list </tt></font></P>
  489.     </TD>
  490.     <TD vAlign=top width="871"><A name=1051893></A> 
  491.       <P>The list of file revisions currently in the client workspace. </P>
  492.     </TD>
  493.   <TR> 
  494.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051896></A> </tt> 
  495.       </font> 
  496.       <P><font size="+1"><tt>head revision </tt></font></P>
  497.     </TD>
  498.     <TD vAlign=top width="871"><A name=1051899></A> 
  499.       <P>The most recent revision of a file within the depot. Because file revisions 
  500.         are numbered sequentially, this revision is the highest-numbered revision 
  501.         of that file. </P>
  502.     </TD>
  503.   <TR> 
  504.     <TD vAlign=top width="232"><font size="+1"><tt><A name=integrate></A> </tt> 
  505.       </font> 
  506.       <P><font size="+1"><tt>integrate </tt></font></P>
  507.     </TD>
  508.     <TD vAlign=top width="871"><A name=1051904></A> 
  509.       <P>To compare two sets of files (for example, two codeline branches) and 
  510.       <UL>
  511.         <A name=1051905></A> 
  512.         <LI>determine which changes in one set apply to the other, <BR>
  513.           <A 
  514.         name=1051906></A> 
  515.         <LI>determine if the changes have already been propagated, <BR>
  516.           <A 
  517.         name=1051907></A> 
  518.         <LI>propagate any outstanding changes.<BR>
  519.         </LI>
  520.       </UL>
  521.     </TD>
  522.   <TR> 
  523.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051909></A> </tt> 
  524.       </font> 
  525.       <P><font size="+1"><tt>Inter-File <BR>
  526.         Branching </tt></font></P>
  527.     </TD>
  528.     <TD vAlign=top width="871"><A name=1051912></A> 
  529.       <P>Perforce's proprietary branching mechanism. </P>
  530.     </TD>
  531.   <TR> 
  532.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051914></A> </tt> 
  533.       </font> 
  534.       <P><font size="+1"><tt>job </tt></font></P>
  535.     </TD>
  536.     <TD vAlign=top width="871"><A name=1051916></A> 
  537.       <P>A user-defined unit of work tracked by Perforce. The job template determines 
  538.         what information is tracked. The template can be modified by the Perforce 
  539.         system administrator </P>
  540.     </TD>
  541.   <TR> 
  542.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051918></A> </tt> 
  543.       </font> 
  544.       <P><font size="+1"><tt>job specification </tt></font></P>
  545.     </TD>
  546.     <TD vAlign=top width="871"><A name=1051920></A> 
  547.       <P>A specification containing the fields and valid values stored for a Perforce 
  548.         job. </P>
  549.     </TD>
  550.   <TR> 
  551.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051923></A> </tt> 
  552.       </font> 
  553.       <P><font size="+1"><tt>job view </tt></font></P>
  554.     </TD>
  555.     <TD vAlign=top width="871"><A name=1051925></A> 
  556.       <P>A syntax used for searching Perforce jobs. </P>
  557.     </TD>
  558.   <TR> 
  559.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051927></A> </tt> 
  560.       </font> 
  561.       <P><font size="+1"><tt>journal </tt></font></P>
  562.     </TD>
  563.     <TD vAlign=top width="871"><A name=1051930></A> 
  564.       <P>A file containing a record of every change made to the Perforce server's 
  565.         metadata since the time of the last checkpoint. </P>
  566.     </TD>
  567.   <TR> 
  568.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051932></A> </tt> 
  569.       </font> 
  570.       <P><font size="+1"><tt>journaling </tt></font></P>
  571.     </TD>
  572.     <TD vAlign=top width="871"><A name=1051934></A> 
  573.       <P>The process of recording changes made to the Perforce server's metadata. 
  574.       </P>
  575.     </TD>
  576.   <TR> 
  577.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051936></A> </tt> 
  578.       </font> 
  579.       <P><font size="+1"><tt>label </tt></font></P>
  580.     </TD>
  581.     <TD vAlign=top width="871"><A name=1051939></A> 
  582.       <P>A named list of user-specified file revisions. </P>
  583.     </TD>
  584.   <TR> 
  585.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051942></A> </tt> 
  586.       </font> 
  587.       <P><font size="+1"><tt>label view </tt></font></P>
  588.     </TD>
  589.     <TD vAlign=top width="871"><A name=1051945></A> 
  590.       <P>The view that specifies which file names in the depot can be stored in 
  591.         a particular label. </P>
  592.     </TD>
  593.   <TR> 
  594.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051947></A> </tt> 
  595.       </font> 
  596.       <P><font size="+1"><tt>lazy copy </tt></font></P>
  597.     </TD>
  598.     <TD vAlign=top width="871"><A name=1051950></A> 
  599.       <P>A method used by Perforce to make internal copies of files without duplicating 
  600.         file content in the depot. Lazy copies minimize the consumption of disk 
  601.         space by storing references to the original file instead of copies of 
  602.         the file. </P>
  603.     </TD>
  604.   <TR> 
  605.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051952></A> </tt> 
  606.       </font> 
  607.       <P><font size="+1"><tt>license file </tt></font></P>
  608.     </TD>
  609.     <TD vAlign=top width="871"><A name=1051954></A> 
  610.       <P>Ensures that the number of Perforce users on your site does not exceed 
  611.         the number for which you have paid. </P>
  612.     </TD>
  613.   <TR> 
  614.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051956></A> </tt> 
  615.       </font> 
  616.       <P><font size="+1"><tt>list access </tt></font></P>
  617.     </TD>
  618.     <TD vAlign=top width="871"><A name=1051958></A> 
  619.       <P>A protection level that enables you to run reporting commands but prevents 
  620.         access to the contents of files. </P>
  621.     </TD>
  622.   <TR> 
  623.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051960></A> </tt> 
  624.       </font> 
  625.       <P><font size="+1"><tt>local depot </tt></font></P>
  626.     </TD>
  627.     <TD vAlign=top width="871"><A name=1051963></A> 
  628.       <P>Any depot located on the current Perforce server. </P>
  629.     </TD>
  630.   <TR> 
  631.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051965></A> </tt> 
  632.       </font> 
  633.       <P><font size="+1"><tt>local syntax </tt></font></P>
  634.     </TD>
  635.     <TD vAlign=top width="871"><A name=1051968></A> 
  636.       <P>The operating-system-specific syntax for specifying a file name. </P>
  637.     </TD>
  638.   <TR> 
  639.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051970></A> </tt> 
  640.       </font> 
  641.       <P><font size="+1"><tt>lock </tt></font></P>
  642.     </TD>
  643.     <TD vAlign=top width="871"><A name=1051972></A> 
  644.       <P>A Perforce file lock prevents other clients from submitting the locked 
  645.         file. Files are unlocked with the <KBD>p4 unlock</KBD> command or submitting 
  646.         the changelist that contains the locked file. </P>
  647.     </TD>
  648.   <TR> 
  649.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051975></A> </tt> 
  650.       </font> 
  651.       <P><font size="+1"><tt>log </tt></font></P>
  652.     </TD>
  653.     <TD vAlign=top width="871"><A name=1051977></A> 
  654.       <P>Error output from the Perforce server. By default, error output is written 
  655.         to standard error. To specify a log file, set the <KBD>P4LOG</KBD> environment 
  656.         variable, or use the <KBD>p4d -L</KBD> flag. </P>
  657.     </TD>
  658.   <TR> 
  659.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051979></A> </tt> 
  660.       </font> 
  661.       <P><font size="+1"><tt>mapping </tt></font></P>
  662.     </TD>
  663.     <TD vAlign=top width="871"><A name=1051982></A> 
  664.       <P>A single line in a view, consisting of a left side and a right side that 
  665.         specify the correspondences between files in the depot and files in a 
  666.         client, label, or branch. The left side specifies the depot file and the 
  667.         right side specifies the client files. <A name=1051992></A> 
  668.       <P>(See also <A 
  669.       href="#1051714"><EM>client view</EM></A>, <A 
  670.       href="#1051648"><EM>branch view</EM></A>, <A 
  671.       href="#1051942"><EM>label view</EM></A>). </P>
  672.     </TD>
  673.   <TR> 
  674.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051995></A> </tt> 
  675.       </font> 
  676.       <P><font size="+1"><tt>MD5 checksum </tt></font></P>
  677.     </TD>
  678.     <TD vAlign=top width="871"><A name=1051997></A> 
  679.       <P>The method used by Perforce to verify the integrity of archived files. 
  680.       </P>
  681.     </TD>
  682.   <TR> 
  683.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1051999></A> </tt> 
  684.       </font> 
  685.       <P><font size="+1"><tt>merge </tt></font></P>
  686.     </TD>
  687.     <TD vAlign=top width="871"><A name=1052002></A> 
  688.       <P>The process of combining the contents of two conflicting file revisions 
  689.         into a single file. </P>
  690.     </TD>
  691.   <TR> 
  692.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052004></A> </tt> 
  693.       </font> 
  694.       <P><font size="+1"><tt>merge file </tt></font></P>
  695.     </TD>
  696.     <TD vAlign=top width="871"><A name=1052007></A> 
  697.       <P>A file generated by Perforce from two conflicting file revisions. </P>
  698.     </TD>
  699.   <TR> 
  700.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052010></A> </tt> 
  701.       </font> 
  702.       <P><font size="+1"><tt>metadata </tt></font></P>
  703.     </TD>
  704.     <TD vAlign=top width="871"><A name=1052013></A> 
  705.       <P>The data stored by the Perforce server that describes the files in the 
  706.         depot, the current state of client workspaces, protections, users, clients, 
  707.         labels, and branches. Metadata includes all the data stored in the server 
  708.         except for the actual contents of the files. </P>
  709.     </TD>
  710.   <TR> 
  711.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052015></A> </tt> 
  712.       </font> 
  713.       <P><font size="+1"><tt>modification time </tt></font></P>
  714.     </TD>
  715.     <TD vAlign=top width="871"><A name=1052017></A> 
  716.       <P>The time a file was last changed. </P>
  717.     </TD>
  718.   <TR> 
  719.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052019></A> </tt> 
  720.       </font> 
  721.       <P><font size="+1"><tt>nonexistent <BR>
  722.         revision </tt></font></P>
  723.     </TD>
  724.     <TD vAlign=top width="871"><A name=1052021></A> 
  725.       <P>A completely empty revision of any file. Syncing to a nonexistent revision 
  726.         of a file removes it from your workspace. An empty file revision created 
  727.         by deleting a file and the <KBD>#none</KBD> revision specifier are examples 
  728.         of nonexistent file revisions. </P>
  729.     </TD>
  730.   <TR> 
  731.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052023></A> </tt> 
  732.       </font> 
  733.       <P><font size="+1"><tt>numbered changelist </tt></font></P>
  734.     </TD>
  735.     <TD vAlign=top width="871"><A name=1052025></A> 
  736.       <P>A pending changelist to which Perforce has assigned a number. </P>
  737.     </TD>
  738.   <TR> 
  739.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052027></A> </tt> 
  740.       </font> 
  741.       <P><font size="+1"><tt>open file </tt></font></P>
  742.     </TD>
  743.     <TD vAlign=top width="871"><A name=1052029></A> 
  744.       <P>A file that you are changing in your client workspace. </P>
  745.     </TD>
  746.   <TR> 
  747.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052031></A> </tt> 
  748.       </font> 
  749.       <P><font size="+1"><tt>owner </tt></font></P>
  750.     </TD>
  751.     <TD vAlign=top width="871"><A name=1052033></A> 
  752.       <P>The Perforce user who created a particular client, branch, or label. 
  753.       </P>
  754.     </TD>
  755.   <TR> 
  756.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052035></A> </tt> 
  757.       </font> 
  758.       <P><font size="+1"><tt><KBD>P4</KBD> </tt></font></P>
  759.     </TD>
  760.     <TD vAlign=top width="871"><A name=1052037></A> 
  761.       <P>The Perforce Command-Line Client program, and the command you issue to 
  762.         execute Perforce commands from the operating system command line. </P>
  763.     </TD>
  764.   <TR> 
  765.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052039></A> </tt> 
  766.       </font> 
  767.       <P><font size="+1"><tt><KBD>P4D</KBD> </tt></font></P>
  768.     </TD>
  769.     <TD vAlign=top width="871"><A name=1052041></A> 
  770.       <P>The program on the Perforce server that manages the depot and the metadata. 
  771.       </P>
  772.     </TD>
  773.   <TR> 
  774.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052043></A> </tt> 
  775.       </font> 
  776.       <P><font size="+1"><tt>P4Diff </tt></font></P>
  777.     </TD>
  778.     <TD vAlign=top width="871"><A name=1052045></A> 
  779.       <P>A Perforce application that displays the differences between two files. 
  780.         <KBD>P4Diff</KBD> is the default application used to compare files during 
  781.         the file resolution process. </P>
  782.     </TD>
  783.  
  784.   <TR> 
  785.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052051></A> </tt> 
  786.       </font> 
  787.       <P><font size="+1"><tt>pending changelist </tt></font></P>
  788.     </TD>
  789.     <TD vAlign=top width="871"><A name=1052054></A> 
  790.       <P>A changelist that has not been submitted. </P>
  791.     </TD>
  792.   <TR> 
  793.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052056></A> </tt> 
  794.       </font> 
  795.       <P><font size="+1"><tt>Perforce server </tt></font></P>
  796.     </TD>
  797.     <TD vAlign=top width="871"><A name=1052061></A> 
  798.       <P>The Perforce depot and metadata on a central host. Also the program that 
  799.         manages the depot and metadata. </P>
  800.     </TD>
  801.   <TR> 
  802.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052071></A> </tt> 
  803.       </font> 
  804.       <P><font size="+1"><tt>protections </tt></font></P>
  805.     </TD>
  806.     <TD vAlign=top width="871"><A name=1052073></A> 
  807.       <P>The permissions stored in the Perforce server's protections table. </P>
  808.     </TD>
  809.   <TR> 
  810.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052075></A> </tt> 
  811.       </font> 
  812.       <P><font size="+1"><tt>RCS format </tt></font></P>
  813.     </TD>
  814.     <TD vAlign=top width="871"><A name=1052078></A> 
  815.       <P>Revision Control System format. Used for storing revisions of text files. 
  816.         RCS format uses reverse delta encoding for file storage. Perforce uses 
  817.         RCS format to store text files. See also <A 
  818.       href="#1052107"><EM>reverse delta storage</EM></A>. </P>
  819.     </TD>
  820.   <TR> 
  821.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052083></A> </tt> 
  822.       </font> 
  823.       <P><font size="+1"><tt>read access </tt></font></P>
  824.     </TD>
  825.     <TD vAlign=top width="871"><A name=1052085></A> 
  826.       <P>A protection level that enables you to read the contents of files managed 
  827.         by Perforce. </P>
  828.     </TD>
  829.   <TR> 
  830.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052087></A> </tt> 
  831.       </font> 
  832.       <P><font size="+1"><tt>remote depot </tt></font></P>
  833.     </TD>
  834.     <TD vAlign=top width="871"><A name=1052090></A> 
  835.       <P>A depot located on a server other than the current Perforce server. </P>
  836.     </TD>
  837.   <TR> 
  838.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052092></A> </tt> 
  839.       </font> 
  840.       <P><font size="+1"><tt>reresolve </tt></font></P>
  841.     </TD>
  842.     <TD vAlign=top width="871"><A name=1052094></A> 
  843.       <P>The process of resolving a file after the file is resolved and before 
  844.         it is submitted </P>
  845.     </TD>
  846.   <TR> 
  847.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052096></A> </tt> 
  848.       </font> 
  849.       <P><font size="+1"><tt>resolve </tt></font></P>
  850.     </TD>
  851.     <TD vAlign=top width="871"><A name=1052099></A> 
  852.       <P>The process you use to reconcile the differences between two revisions 
  853.         of a file. </P>
  854.     </TD>
  855.   <TR> 
  856.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052107></A> </tt> 
  857.       </font> 
  858.       <P><font size="+1"><tt>reverse delta <BR>
  859.         storage </tt></font></P>
  860.     </TD>
  861.     <TD vAlign=top width="871"><A name=1052110></A> 
  862.       <P>The method that Perforce uses to store revisions of text files. Perforce 
  863.         stores the changes between each revision and its previous revision, plus 
  864.         the full text of the head revision. </P>
  865.     </TD>
  866.   <TR> 
  867.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052112></A> </tt> 
  868.       </font> 
  869.       <P><font size="+1"><tt>revert </tt></font></P>
  870.     </TD>
  871.     <TD vAlign=top width="871"><A name=1052115></A> 
  872.       <P>To discard the changes you have made to a file in the client workspace. 
  873.       </P>
  874.     </TD>
  875.   <TR> 
  876.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052117></A> </tt> 
  877.       </font> 
  878.       <P><font size="+1"><tt>review access </tt></font></P>
  879.     </TD>
  880.     <TD vAlign=top width="871"><A name=1052119></A> 
  881.       <P>A special protections level that includes <KBD>read</KBD> and <KBD>list</KBD> 
  882.         accesses, and grants permission to run the <KBD>review</KBD> command. 
  883.       </P>
  884.     </TD>
  885.   <TR> 
  886.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052121></A> </tt> 
  887.       </font> 
  888.       <P><font size="+1"><tt>review daemon </tt></font></P>
  889.     </TD>
  890.     <TD vAlign=top width="871"><A name=1052125></A> 
  891.       <P>Any daemon process that uses the <KBD>p4 review</KBD> command. See also 
  892.         <A 
  893.       href="#1051678"><EM>change review</EM></A>. </P>
  894.     </TD>
  895.   <TR> 
  896.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052135></A> </tt> 
  897.       </font> 
  898.       <P><font size="+1"><tt>revision number </tt></font></P>
  899.     </TD>
  900.     <TD vAlign=top width="871"><A name=1052138></A> 
  901.       <P>A number indicating which revision of the file is being referred to. 
  902.       </P>
  903.     </TD>
  904.   <TR> 
  905.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052140></A> </tt> 
  906.       </font> 
  907.       <P><font size="+1"><tt>revision range </tt></font></P>
  908.     </TD>
  909.     <TD vAlign=top width="871"><A name=1052143></A> 
  910.       <P>A range of revision numbers for a specified file, specified as the low 
  911.         and high end of the range. For example, <KBD>foo#5,7</KBD> specifies revisions 
  912.         5 through 7 of file <KBD>foo</KBD>. </P>
  913.     </TD>
  914.   <TR> 
  915.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052145></A> </tt> 
  916.       </font> 
  917.       <P><font size="+1"><tt>revision specification </tt></font></P>
  918.     </TD>
  919.     <TD vAlign=top width="871"><A name=1052148></A> 
  920.       <P>A suffix to a filename that specifies a particular revision of that file. 
  921.         Revision specifiers can be revision numbers, change numbers, label names, 
  922.         date/time specifications, or client names. </P>
  923.     </TD>
  924.   <TR> 
  925.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052353></A> </tt> 
  926.       </font> 
  927.       <P><font size="+1"><tt>server </tt></font></P>
  928.     </TD>
  929.     <TD vAlign=top width="871"><A name=1052355></A> 
  930.       <P>In Perforce, the program that executes the commands sent by client programs. 
  931.         The Perforce server (<KBD>p4d</KBD>) maintains depot files and metadata 
  932.         describing the files, and tracks the state of client workspaces. </P>
  933.     </TD>
  934.   <TR> 
  935.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052161></A> </tt> 
  936.       </font> 
  937.       <P><font size="+1"><tt>server root </tt></font></P>
  938.     </TD>
  939.     <TD vAlign=top width="871"><A name=1052163></A> 
  940.       <P>The directory in which the server program stores its metadata and all 
  941.         the shared files. To specify the server root, set the <KBD>P4ROOT</KBD> 
  942.         environment variable. </P>
  943.     </TD>
  944.   <TR> 
  945.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052169></A> </tt> 
  946.       </font> 
  947.       <P><font size="+1"><tt>status </tt></font></P>
  948.     </TD>
  949.     <TD vAlign=top width="871"><A name=1052171></A> 
  950.       <P>For a changelist, a value that indicates whether the changelist is new, 
  951.         pending, or submitted. For a job, a value that indicates whether the job 
  952.         is open, closed, or suspended. You can customize job statuses. </P>
  953.     </TD>
  954.   <TR> 
  955.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052173></A> </tt> 
  956.       </font> 
  957.       <P><font size="+1"><tt>submit </tt></font></P>
  958.     </TD>
  959.     <TD vAlign=top width="871"><A name=1052176></A> 
  960.       <P>To send a pending changelist and changed files to the Perforce server 
  961.         for processing. </P>
  962.     </TD>
  963.   <TR> 
  964.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052178></A> </tt> 
  965.       </font> 
  966.       <P><font size="+1"><tt>subscribe </tt></font></P>
  967.     </TD>
  968.     <TD vAlign=top width="871"><A name=1052181></A> 
  969.       <P>To register to receive email whenever changelists that affect particular 
  970.         files are submitted. </P>
  971.     </TD>
  972.   <TR> 
  973.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052183></A> </tt> 
  974.       </font> 
  975.       <P><font size="+1"><tt>super access </tt></font></P>
  976.     </TD>
  977.     <TD vAlign=top width="871"><A name=1052185></A> 
  978.       <P>An access level that gives the user permission to run <EM>every</EM> 
  979.         Perforce command, including commands that set protections, install triggers, 
  980.         or shut down the server for maintenance. </P>
  981.     </TD>
  982.   <TR> 
  983.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052187></A> </tt> 
  984.       </font> 
  985.       <P><font size="+1"><tt>symlink file type </tt></font></P>
  986.     </TD>
  987.     <TD vAlign=top width="871"><A name=1052189></A> 
  988.       <P>A Perforce file type assigned to UNIX symbolic links. On non-UNIX clients, 
  989.         symlink files are stored as text files. </P>
  990.     </TD>
  991.   <TR> 
  992.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052192></A> </tt> 
  993.       </font> 
  994.       <P><font size="+1"><tt>sync </tt></font></P>
  995.     </TD>
  996.     <TD vAlign=top width="871"><A name=1052194></A> 
  997.       <P>To copy a file revision (or set of file revisions) from the depot to 
  998.         a client workspace. </P>
  999.     </TD>
  1000.   <TR> 
  1001.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052196></A> </tt> 
  1002.       </font> 
  1003.       <P><font size="+1"><tt>target file </tt></font></P>
  1004.     </TD>
  1005.     <TD vAlign=top width="871"><A name=1052198></A> 
  1006.       <P>The file that receives the changes from the donor file when you are integrating 
  1007.         changes between a branched codeline and the original codeline. </P>
  1008.     </TD>
  1009.   <TR> 
  1010.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052201></A> </tt> 
  1011.       </font> 
  1012.       <P><font size="+1"><tt>text file type </tt></font></P>
  1013.     </TD>
  1014.     <TD vAlign=top width="871"><A name=1052204></A> 
  1015.       <P>Perforce file type assigned to a file that contains only ASCII text. 
  1016.         See also <A 
  1017.       href="#1051626"><EM>binary file type</EM></A>. </P>
  1018.     </TD>
  1019.   <TR> 
  1020.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052210></A> </tt> 
  1021.       </font> 
  1022.       <P><font size="+1"><tt>theirs </tt></font></P>
  1023.     </TD>
  1024.     <TD vAlign=top width="871"><A name=1052213></A> 
  1025.       <P>The revision in the depot with which the client file is merged when you 
  1026.         resolve a file conflict. When you are working with branched files, <A 
  1027.       href="#1052210"><EM>theirs</EM></A> is the donor file. </P>
  1028.     </TD>
  1029.   <TR> 
  1030.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052218></A> </tt> 
  1031.       </font> 
  1032.       <P><font size="+1"><tt>three-way merge </tt></font></P>
  1033.     </TD>
  1034.     <TD vAlign=top width="871"><A name=1052221></A> 
  1035.       <P>The process of combining three file revisions. During a three-way merge, 
  1036.         you can identify where conflicting changes have occurred and specify how 
  1037.         you want to resolve the conflicts. </P>
  1038.     </TD>
  1039.   <TR> 
  1040.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052223></A> </tt> 
  1041.       </font> 
  1042.       <P><font size="+1"><tt>tip revision </tt></font></P>
  1043.     </TD>
  1044.     <TD vAlign=top width="871"><A name=1052229></A> 
  1045.       <P>In Perforce, the <A 
  1046.       href="#1051896"><EM>head revision</EM></A>. <EM>Tip revision</EM> is a term 
  1047.         used by some other SCM systems. </P>
  1048.     </TD>
  1049.   <TR> 
  1050.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052232></A> </tt> 
  1051.       </font> 
  1052.       <P><font size="+1"><tt>trigger </tt></font></P>
  1053.     </TD>
  1054.     <TD vAlign=top width="871"><A name=1052234></A> 
  1055.       <P>A script automatically invoked by the Perforce server when changelists 
  1056.         are submitted. </P>
  1057.     </TD>
  1058.   <TR> 
  1059.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052237></A> </tt> 
  1060.       </font> 
  1061.       <P><font size="+1"><tt>two-way merge </tt></font></P>
  1062.     </TD>
  1063.     <TD vAlign=top width="871"><A name=1052240></A> 
  1064.       <P>The process of combining two file revisions. In a two-way merge, you 
  1065.         can see differences between the files but cannot see conflicts. </P>
  1066.     </TD>
  1067.   <TR> 
  1068.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052242></A> </tt> 
  1069.       </font> 
  1070.       <P><font size="+1"><tt>typemap </tt></font></P>
  1071.     </TD>
  1072.     <TD vAlign=top width="871"><A name=1052244></A> 
  1073.       <P>A Perforce table in which you assign Perforce file types to files. </P>
  1074.     </TD>
  1075.   <TR> 
  1076.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052246></A> </tt> 
  1077.       </font> 
  1078.       <P><font size="+1"><tt>user </tt></font></P>
  1079.     </TD>
  1080.     <TD vAlign=top width="871"><A name=1052248></A> 
  1081.       <P>The identifier that Perforce uses to determine who is performing an operation. 
  1082.       </P>
  1083.     </TD>
  1084.   <TR> 
  1085.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052250></A> </tt> 
  1086.       </font> 
  1087.       <P><font size="+1"><tt>view </tt></font></P>
  1088.     </TD>
  1089.     <TD vAlign=top width="871"><A name=1052256></A> 
  1090.       <P>A description of the relationship between two sets of files. See <A 
  1091.       href="#1051714"><EM>client view</EM></A>, <A 
  1092.       href="#1051942"><EM>label view</EM></A>, <A 
  1093.       href="#1051648"><EM>branch view</EM></A>. </P>
  1094.     </TD>
  1095.   <TR> 
  1096.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052264></A> </tt> 
  1097.       </font> 
  1098.       <P><font size="+1"><tt>wildcard </tt></font></P>
  1099.     </TD>
  1100.     <TD vAlign=top width="871"><A name=1052266></A> 
  1101.       <P>A special character used to match other characters in strings. Perforce 
  1102.         wildcards are: 
  1103.       <UL>
  1104.         <A name=1052267></A> 
  1105.         <LI><KBD>*</KBD> matches anything except a slash<BR>
  1106.           <A name=1052268></A> 
  1107.         <LI><KBD>...</KBD> matches anything including slashes<BR>
  1108.           <A 
  1109.         name=1052269></A> 
  1110.         <LI><KBD>%d</KBD> used for parameter substitution in views<BR>
  1111.         </LI>
  1112.       </UL>
  1113.     </TD>
  1114.   <TR> 
  1115.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052278></A> </tt> 
  1116.       </font> 
  1117.       <P><font size="+1"><tt>write access </tt></font></P>
  1118.     </TD>
  1119.     <TD vAlign=top width="871"><A name=1052280></A> 
  1120.       <P>A protection level that enables you to run commands that alter the contents 
  1121.         of files in the depot. <KBD>Write</KBD> access includes <KBD>read</KBD> 
  1122.         and <KBD>list</KBD> accesses. </P>
  1123.     </TD>
  1124.   <TR> 
  1125.     <TD vAlign=top width="232"><font size="+1"><tt><A name=1052282></A> </tt> 
  1126.       </font> 
  1127.       <P><font size="+1"><tt>yours </tt></font></P>
  1128.     </TD>
  1129.     <TD vAlign=top width="871"><A name=1052285></A> 
  1130.       <P>The edited version of a file in the client workspace, when you resolve 
  1131.         a file. Also, the target file when you integrate a branched file. </P>
  1132.     </TD>
  1133.   </TR>
  1134. </TABLE>
  1135. <TABLE>
  1136.   <TBODY>
  1137.   <TR>
  1138.     <TD></TR></TBODY></TABLE>
  1139.  
  1140. <hr>
  1141. <p>
  1142. <p><img src=../images/perforcelogo.png alt="Copyright Perforce Software 2003-2012. All Rights Reserved."></p>
  1143. </body>
  1144. </html>
# Change User Description Committed
#1 16816 nrkruk "Forking branch 2015-1 of perforce-software-p4eclipse to nrkruk-p4eclipse." 9 years ago
//guest/perforce_software/p4eclipse/2015-1/src/3.7/plugins/com.perforce.team.help.ui/topics/glossary.html
#1 16761 Matt Attaway Post 2015.1 source code for P4Eclipse 9 years ago