RE: How to merge between branch and trunk multiple times with tags - quick questions (UNCLASSIFIED)

------=_NextPart_000_01A1_01CF6476.231CC400
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: 7bit

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



------=_NextPart_000_01A1_01CF6476.231CC400
Content-Type: application/x-pkcs7-signature; name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="smime.p7s"

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
A1UECxMDUEtJMRgwFgYDVQQDEw9ET0QgRU1BSUwgQ0EtMjkwggEiMA0GCSqGSIb3DQEBAQUAA4IB
DwAwggEKAoIBAQCSYi9BwiAAFgZVZJ+9p4gVboKbSMGFd70CqwzZ8StggQG6PnVwjhKmpziEkLPp
QIAS3GrKUc2tLYYQzES8DsVYOBmyFDIlQVRYXEMOyGxzD8MMGBgWBJpSPYGicc48MgCfcVW6+M42
dx4htyiU5z0+pvbAejFgkSiXdyJQ8saTbrIbxUHG+aE3+xC/2lam+1JNX7/vxJZ3KOUy/+jhGMxD
UhisjXeackzonQNesKLv5N3S5+anplKt4ZgIlkpDzHM9S6KNie/cgky4SoAkZSsekYL1BPZyH1cY
QBfwOVG2j/OJO2f3WE5KvNr5DsHADL3zCHH4gw/JLoCV9IUOzq6pAgMBAAGjggIcMIICGDAOBgNV
HQ8BAf8EBAMCAYYwHwYDVR0jBBgwFoAUSXS7DF66ev4CVO97oMaVxgmAcJYwHQYDVR0OBBYEFLhD
g2Qheu5wgd6l3gxgKId4rl54MBIGA1UdEwEB/wQIMAYBAf8CAQAwDAYDVR0kBAUwA4ABADBmBgNV
HSAEXzBdMAsGCWCGSAFlAgELBTALBglghkgBZQIBCwkwCwYJYIZIAWUCAQsRMAsGCWCGSAFlAgEL
EjALBglghkgBZQIBCxMwDAYKYIZIAWUDAgEDGjAMBgpghkgBZQMCAQMbMDcGA1UdHwQwMC4wLKAq
oCiGJmh0dHA6Ly9jcmwuZGlzYS5taWwvY3JsL0RPRFJPT1RDQTIuY3JsMIIBAQYIKwYBBQUHAQEE
gfQwgfEwOgYIKwYBBQUHMAKGLmh0dHA6Ly9jcmwuZGlzYS5taWwvaXNzdWVkdG8vRE9EUk9PVENB
Ml9JVC5wN2MwIAYIKwYBBQUHMAGGFGh0dHA6Ly9vY3NwLmRpc2EubWlsMIGQBggrBgEFBQcwAoaB
g2xkYXA6Ly9jcmwuZ2RzLmRpc2EubWlsL2NuJTNkRG9EJTIwUm9vdCUyMENBJTIwMiUyY291JTNk
UEtJJTJjb3UlM2REb0QlMmNvJTNkVS5TLiUyMEdvdmVybm1lbnQlMmNjJTNkVVM/Y3Jvc3NDZXJ0
aWZpY2F0ZVBhaXI7YmluYXJ5MA0GCSqGSIb3DQEBBQUAA4IBAQAsayx5NdvwHhyHe6vh6GlqN4vb
ek9VYGmVL1OdxspDttQ3kdYDXX5asbgd956B065QVDCkb0suuxQbF6pcENOUejE5lqRUefXpVi5V
wxsW6qoCyM9R9zKBIsY0OqnNmqpIk8fp+x4yfnHEdvBFVBIdVeq9XDKHOq6Tmm6ZIl+oUTXuslNg
X/ZPRbgWhB1lVc0VyhABH6nSnKdXkaPX57CGPS30iTrYyXdwUMZs7/LrmPgQqj3ayFwprc64c0lM
oZK75u3NuoIaYyEZZfQGGb+DqnPl0xuxmP9F3/tJzHPo4ucHlgAx6X/ZJAjnykR6SAbDQtg/+XmH
pTeSFqmEIJJjMYIDMjCCAy4CAQEwZDBdMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zl
cm5tZW50MQwwCgYDVQQLEwNEb0QxDDAKBgNVBAsTA1BLSTEYMBYGA1UEAxMPRE9EIEVNQUlMIENB
LTI5AgMY68UwCQYFKw4DAhoFAKCCAaMwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG
9w0BCQUxDxcNMTQwNDMwMTgxNDM3WjAjBgkqhkiG9w0BCQQxFgQUb5FIVmrO98SxzR7LAMSn29Wm
rIcwWAYJKoZIhvcNAQkPMUswSTAKBggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwBwYFKw4DAgcw
DQYIKoZIhvcNAwICASgwBwYFKw4DAhowCgYIKoZIhvcNAgUwcwYJKwYBBAGCNxAEMWYwZDBdMQsw
CQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxDDAKBgNV
BAsTA1BLSTEYMBYGA1UEAxMPRE9EIEVNQUlMIENBLTI5AgMY68kwdQYLKoZIhvcNAQkQAgsxZqBk
MF0xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsTA0RvRDEM
MAoGA1UECxMDUEtJMRgwFgYDVQQDEw9ET0QgRU1BSUwgQ0EtMjkCAxjryTANBgkqhkiG9w0BAQEF
AASCAQAXBRhWb0j1NEXaJFCO0t0X2PkLwNmWIzg4GvoYqFnA0HwPiOWDpJZIaf/6P5H7iX4RUUNs
QSZhPY6prAqjSK9ESMnwMVhKXIaBuIgYss/fq51dLdqx6hIUUZ6MLsV554sZAVTSljUE15KJDN2j
sIehrIAj+MS3uVhaB65A6eD/ZZOijKfwfKlWBXGqRxVRlGVshzF0P+/YueEhVPy86cUkgW0YoU+H
EDx4FS/3varwDXZWtixFvO5YSqC5azzz8I/JPmI0o9wr1olgVjacH8/6k+yWZ5KQ6bA8Dx3SYTlW
6+u+aWGjfLcf8W7M/0K6GpOVlJNYpWhIafNFfkMXKfQpAAAAAAAA

------=_NextPart_000_01A1_01CF6476.231CC400--