info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: How to merge between branch and trunk multiple times with tags - qui


From: Glasgow, Steven R CIV USARMY TRADOC ANALYSIS CTR (US)
Subject: RE: How to merge between branch and trunk multiple times with tags - quick questions (UNCLASSIFIED)
Date: Wed, 30 Apr 2014 18:22:35 +0000

Classification: UNCLASSIFIED
Caveats: NONE

Sorry, I use the terms "baseline" and "trunk" interchangeably.


-----Original Message-----
From: address@hidden
[mailto:address@hidden On Behalf Of
Glasgow, Steven R CIV USARMY TRADOC ANALYSIS CTR (US)
Sent: Wednesday, April 30, 2014 1:07 PM
To: address@hidden
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: address@hidden
[mailto:address@hidden On Behalf Of
Zk W
Sent: Wednesday, April 30, 2014 11:28 AM
To: address@hidden
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


Attachment: smime.p7s
Description: S/MIME cryptographic signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]