Find Answers

Filter Search Results
All Operating Systems:
All Products:

All Solution Types:
Source:
 
Ask a Question
Example: "Database could not be verified"  
Tips | Start Over | Solutions | Alerts | Patches | Defects  
Pages [Next]
  Results
CMS-XML VM: Promoting a file shows error: Could not promote the revision associated with this group FromGroup because it crosses a branch.
Executing the promote would move Production from the trunk line of development (1.*) to the branch line of development (1.2.1.*). To ensure this move is done deliberately, and not because someone forgot to merge branch code back to the trunk before promoting, the box OK to move across branches must be checked on Promote dialog:
PDF Serena ChangeMan Version Manager User's Guide
She is now ready to merge her changes back into the main development trunk of the Chess application. She notes that a new revision exists for each of the chessboard files (revision 1.7) and concludes that another Developer modified the files while she worked on the branch revisions. For each chessboard file , Terri's intention is to merge the tip revisions of the trunk and branch into a single file , and then check that merged file back in to the trunk as the newest revision, 1.8.
PDF Serena PVCS Version Manager User’s Guide
She is now ready to merge her changes back into the main development trunk of the Chess application. She notes that a new revision exists for each of the chessboard files (revision 1.7) and concludes that another Developer modified the files while she worked on the branch revisions. For each chessboard file , Terri's intention is to merge the tip revisions of the trunk and branch into a single file , and then check that merged file back in to the trunk as the newest revision, 1.8.
CMS-XML About: Automatic Merging (an overview)
Merging of any kind ... The BASE file ... which the two files to merge originated. File 1 and File 2 ... are the two files in their current ... are to be merged . ... is always a file (not a ... ) containing the merged information plus information ... The four MERGE options are: Merge Revisions:Base, File 1 and File 2 are in ... is to a file . Merge Revison and Workfile:Base and File 1 are assumed ... same archive; File 2 and Output are files . Automatic Merge :See below ...
CMS-XML About: #1481 Version Manager Merge
One of the two files that is being compared to this base revision is 1.4 (which is the tip of the trunk ) and the other is 1.1.1.1 (which is the tip of the branch). This is often the case when merging a branch back in to the main trunk . ... Output of merge operation
CMS-XML KM-Dim10: Reported Defect 109178: Issue Fixed in Dimensions 10.1.1: Branching out in a multiple developer environment the branch revisions never get merged back into the trunk.
KM-Dim10: Reported Defect 109178: Issue Fixed in Dimensions 10.1.1: Branching out in a multiple developer environment the branch revisions never get merged back into the trunk .
CMS-XML About: #1494 Part 3 of 3: Branches and Branch-Only Projects in VM
... code and other files such as documentation ... ... the project's archive files to handle the ... The trunk is a small ... a Hydra'd archive file . ... emanate from the trunk , and are ... The TRUNK : TRUNK : The policy ... Files that are shared ... ... promotes all its files from DEVELOPMENT to ... promoted all its files from ACCEPTANCE to ... would the shared files be in PRODUCTION ... all the other files would still be ... ... the same archive files . ... project, all merging of accepted branches ... ... next step is MERGING . ... project, the merge can be made into the trunk to accomplish implementation ...
CMS-XML KM-Dim7: Branching in Powerbuilder 7.0 with the SCC Interface to Dimensions
... 9. A merge of revisions 4 ... to create a trunk revision that contains ... Still in the Registration Report dialogue box select the Merge -Diff tab. Select the two revisions to merge and hit the merge button. ... for images.Fig.6 Merge bug fix back into trunk ... For information on merging please consult the Merge Users Guide available from the PVCS Dimensions On-line Documentation. ... 10. With the merge complete choose File /Save Target to save merge output. ... for images.Fig.8 Pedigree after Merge .
PDF Dimensions Express Quick Start Guide
... now needs to merge the changes in ... of these projects back into the main project TRUNK . ... desktop client to merge the changes. ... two of the files as conflicts. ... versions for those files from ACME V ... To merge two projects branched ... ... How Can I Merge Two Parallel Projects ... ... tree and select Merge . Ancestor tab of the Project Merge dialog box is displayed. ... 6 Select the common ancestor project, TRUNK , in the list, and click OK. ... How Can I Merge Two Parallel Projects Using the Desktop Client? ... 15 Select the target project, TRUNK , in the list, and click OK.
CMS-XML How To: Merge Files Archived by PVCS Version Manager
Usually the trunk tip, but may be any revision you plan to merge into (the one in QA right now, for instance). Reasons: a) you need a copy for edit and test. b) you need the lock because you need to reserve the right to do a check-in, and to flag everyone on the team that the file is busy.
Pages [Next]

Welcome kb sso

My Recent Searches

Search Feedback

Are we answering your questions?

Product Demos

Dimensions CM: Resolving conflicts (demonstration)
This demonstration shows you how to resolve conflicts between your work area files and the item tip revisions in a stream in Dimensions CM

Additional Assistance

  • Submit a Case Online
  • FAQs