Classification: UNCLASSIFIED Caveats: NONE To merge changes from the branch back into the trunk:
Checkout a trunk sandbox cvs tag prior_to_<branchName>_merge_date cvs update -j <branchName> resolve conflicts commit changes to repository cvs tag after_<branchName>_merge_date -----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of Glasgow, Steven R CIV USARMY TRADOC ANALYSIS CTR (US) Sent: Wednesday, April 30, 2014 1:07 PM To: [email protected] Subject: RE: How to merge between branch and trunk multiple times with tags - quick questions (UNCLASSIFIED) Classification: UNCLASSIFIED Caveats: NONE The first time you pull changes from the baseline to your branch: In your branch sandbox cvs update -j HEAD In an updated baseline sandbox cvs -q tag merged_to_<branchName>_date1 Note that this requires two sandboxes, you must update your branch sandbox and tag the baseline, not your branch, at that point. The next time you want to update your sandbox with changes from the baseline: In your branch sandbox cvs update -j merged_to_<branchName>_date1 -j HEAD In an updated baseline sandbox cvs -q tag merged_to_<branchName>_date2 Steve -----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of Zk W Sent: Wednesday, April 30, 2014 11:28 AM To: [email protected] Subject: How to merge between branch and trunk multiple times with tags - quick questions Hi All We're new to CVS and we need to merge trunk changes to a branch from time to time. We are not sure how the -j option is used for the 1st merge from trunk to branch. We are also unsure how the multiple -j options are used for subsequent merges from trunk to the same branch. What's the syntax to merge back from a long lived branch to the trunk? Are there examples on how we should tag before and after a merge ? Thank you Sincerely Classification: UNCLASSIFIED Caveats: NONE Classification: UNCLASSIFIED Caveats: NONE
smime.p7s
Description: S/MIME cryptographic signature
