| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
| "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| <!-- |
| |
| Licensed to the Apache Software Foundation (ASF) under one |
| or more contributor license agreements. See the NOTICE file |
| distributed with this work for additional information |
| regarding copyright ownership. The ASF licenses this file |
| to you under the Apache License, Version 2.0 (the |
| "License"); you may not use this file except in compliance |
| with the License. You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, |
| software distributed under the License is distributed on an |
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
| KIND, either express or implied. See the License for the |
| specific language governing permissions and limitations |
| under the License. |
| |
| --> |
| <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> |
| <head> |
| <title>CVS: Merge Changes from Branch Dialog Box</title> |
| <link rel="stylesheet" href="ide.css" title="Oracle BLAFDoc" type="text/css"/> |
| </head> |
| |
| <body> |
| <p><a id="org.netbeans.modules.versioning.system.cvss.ui.actions.tag.MergeBranchAction" name="org.netbeans.modules.versioning.system.cvss.ui.actions.tag.MergeBranchAction"></a></p> |
| <div id="NBCSH1738"><!-- infolevel="all" infotype="General" --><a id="sthref216" name="sthref216"></a> |
| <h1>CVS: Merge Changes from Branch Dialog Box</h1> |
| <a name="BEGIN" id="BEGIN"></a> |
| <p>The Merge Changes from Branch dialog box enables you to merge files from a branch or the trunk to your local working directory. |
| <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer"> |
| <param name="content" value="http://www.oracle.com/pls/topic/lookup?ctx=nb8200&id=NBDAG2377"> |
| <param name="text" value="<html><u>How?</u></html>"> |
| <param name="textFontSize" value="medium"> |
| <param name="textColor" value="blue"> |
| </object> |
| </p> |
| <p>Current Working Branch is your local working directory. This field contains Trunk if you are working in the trunk, or the name of a branch.</p> |
| <p>When merging files, select one of the following:</p> |
| |
| <table summary="User interface elements and descriptions" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0"> |
| <col width="24%" /> |
| <col width="*" /> |
| <thead> |
| <tr align="left" valign="top"> |
| <th align="left" valign="bottom" id="r1c1-t29">Element</th> |
| <th align="left" valign="bottom" id="r1c2-t29">Description</th> |
| </tr> |
| </thead> |
| <tbody> |
| <tr align="left" valign="top"> |
| <td align="left" id="r2c1-t29" headers="r1c1-t29"> |
| <p>Merge from Trunk</p> |
| </td> |
| <td align="left" headers="r2c1-t29 r1c2-t29">Select this to merge changes that were made in the trunk to your working directory.</td> |
| </tr> |
| <tr align="left" valign="top"> |
| <td align="left" id="r3c1-t29" headers="r1c1-t29"> |
| <p>Merge from Branch</p> |
| </td> |
| <td align="left" headers="r3c1-t29 r1c2-t29">Select this to merge changes that were made in the specified branch to your working directory. When you choose this option, specify the name of the branch you want to merge into your local repository. You can enter the name of the branch in the text field or click Browse to open the Browse Tags dialog box and choose from the available branches.</td> |
| </tr> |
| </tbody> |
| </table> |
| <br /> |
| <!-- --> |
| <p>You can set the following options when merging files to your local repository:</p> |
| |
| <table summary="User interface elements and descriptions" dir="ltr" border="1" width="100%" frame="hsides" rules="groups" cellpadding="3" cellspacing="0"> |
| <col width="24%" /> |
| <col width="*" /> |
| <thead> |
| <tr align="left" valign="top"> |
| <th align="left" valign="bottom" id="r1c1-t30">Element</th> |
| <th align="left" valign="bottom" id="r1c2-t30">Description</th> |
| </tr> |
| </thead> |
| <tbody> |
| <tr align="left" valign="top"> |
| <td align="left" id="r2c1-t30" headers="r1c1-t30"> |
| <p>Merge Only Changes Made after Tag</p> |
| </td> |
| <td align="left" headers="r2c1-t30 r1c2-t30">When selected, only changes made after the specified tag are merged into your local repository. Enter the name of the tag in the text field or click Browse to open the Browse Tags dialog box and choose from the available tags. If unselected, all changes are merged into your local repository.</td> |
| </tr> |
| <tr align="left" valign="top"> |
| <td align="left" id="r3c1-t30" headers="r1c1-t30"> |
| <p>Tag Trunk After Merge</p> |
| </td> |
| <td align="left" headers="r3c1-t30 r1c2-t30">When selected, the trunk is tagged after merging to mark changes you have already merged. Enter the tag to attach after the merge, or click Browse to choose an existing tag. If unselected, no tag is attached to the source branch.</td> |
| </tr> |
| </tbody> |
| </table> |
| <br /> |
| <!-- --> |
| <a id="NBCSH1743" name="NBCSH1743"></a> |
| <hr><p><b>Related Topics</b></p> |
| <p><i>Developing Applications with NetBeans IDE</i>, |
| <object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer"> |
| <param name="content" value="http://www.oracle.com/pls/topic/lookup?ctx=nb8200&id=NBDAG236"> |
| <param name="text" value="<html><u>"Versioning Applications with CVS"</u></html>"> |
| <param name="textFontSize" value="medium"> |
| <param name="textColor" value="blue"> |
| </object> |
| </p> |
| |
| <!-- --> |
| <!-- Start Footer --> |
| |
| |
| <table summary="" cellspacing="0" cellpadding="0" width="100%"> |
| <tr> |
| <td align="left" width="86%"><a href="legal_notice.htm"> |
| Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0.</a> |
| </td> |
| </tr> |
| </table> |
| <!-- --> |
| </body> |
| </html> |
