RE: changes on multiple branches (UNCLASSIFIED)
"Glasgow, Steven R CIV USARMY TRADOC ANALYSIS CTR (US)" <[email protected]> Tue, 24 Sep 2013 12:24:42 +0000
| Newsgroups | gmane.comp.version-control.cvs.general |
|---|---|
| Message-ID | <6132691E064DAC49B214555A634702745EB50BBD@UTINHPZV.easf.csd.disa.mil> |
------=_NextPart_000_049F_01CEB8F7.10C45BE0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Classification: UNCLASSIFIED Caveats: NONE Thanks Arthur, we are still using version 1.11 of CVS under Linux (revision 23), as that is what comes bundled with RHEL. Two questions: 1) I've looked for 1.12 to download and can find nothing that calls 1.12 "stable". All downloads for this version are under the "feature" directories. Is there a stable version of 1.12? 2) Is there documentation available that lays out how to use change sets...a web link somewhere? Thanks, Steve -----Original Message----- From: Arthur Barrett [mailto:[email protected]] Sent: Monday, September 23, 2013 6:07 PM To: Glasgow, Steven R CIV USARMY TRADOC ANALYSIS CTR (US); [email protected] Subject: RE: changes on multiple branches (UNCLASSIFIED) Steve, And if you think that's a lot of fussing around for a simple result - it's why 'changesets' were invented: http://march-hare.com/cvsnt/features/changesets/en.asp CVS supports two kinds of changesets: - CVSNT 2.x and CVS 1.12 both support 'atomic' changesets (what Subvserion calls 'atomic commits') - CVSNT 2.x on Linux/Unix/Windows/Mac supports 'user defined' changesets (what ClearCase calls a 'defect') I have observed that increasingly the job of managing 'change sets' is being offloaded into proprietary systems (Jira et al) even when the 'source control' is open. I'm not a fan of this for several reasons, but mostly I just think that pragmatically the information about the relationship between one change and the other belongs in the versioned repository not in a separate database. note: it has been observed that if your CVS repository gets cluttered with 'too many' tags the performance can decrease, which is (one of many reasons) why in CVSNT 2.x for Linux/Unix/Windows/Mac we put in user defined changesets. Regards, Arthur Barrett > -----Original Message----- > From: > [email protected] > [mailto:info-cvs-bounces+arthur.barrett=march-hare.com@nongnu. > org] On Behalf Of Glasgow, Steven R CIV USARMY TRADOC ANALYSIS CTR > (US) > Sent: 19 September 2013 04:43 > To: [email protected] > Subject: changes on multiple branches (UNCLASSIFIED) > > > Classification: UNCLASSIFIED > Caveats: NONE > > Please consider this situation. > > Off of the trunk, I have two branches (lines of development), each one > implementing a separate new features in the source code. > > Development team 1 finds a previously undiscovered error on their > branch that existed on the trunk prior the creation of either branch. > Will the following steps correct the error on both branches? > > 1. Checkout branch 1 into a sandbox > 2. Correct the error in the sandbox > 3. Tag the repository with a "begin-commit" tag 4. Commit the changes > on branch 1 5. Tag the repository with a "end-commit" tag > > 6. Convert the sandbox over to branch 2 (or checkout branch 2 into > another > sandbox) > 7. Cvs update -j begin-commit -j end-commit to pull the changes into > the branch 2 sandbox 8. Commit the changes on branch 2 > > Will cvs know to pull the changes made to branch 1 based on the tags > into the branch 2 sandbox? > > Thank you in advance for your assistance, Steve > > > > Classification: UNCLASSIFIED > Caveats: NONE > > > Classification: UNCLASSIFIED Caveats: NONE ------=_NextPart_000_049F_01CEB8F7.10C45BE0 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 pTeSFqmEIJJjMYIDQTCCAz0CAQEwZDBdMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zl cm5tZW50MQwwCgYDVQQLEwNEb0QxDDAKBgNVBAsTA1BLSTEYMBYGA1UEAxMPRE9EIEVNQUlMIENB LTI5AgMY68UwCQYFKw4DAhoFAKCCAbIwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG 9w0BCQUxDxcNMTMwOTI0MTIyNDExWjAjBgkqhkiG9w0BCQQxFgQUKaNOKIn8wviu8B7rFck+Y0Ul 1UwwZwYJKoZIhvcNAQkPMVowWDAKBggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcN AwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwBwYFKw4DAhowCgYIKoZIhvcNAgUwcwYJKwYB BAGCNxAEMWYwZDBdMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYD VQQLEwNEb0QxDDAKBgNVBAsTA1BLSTEYMBYGA1UEAxMPRE9EIEVNQUlMIENBLTI5AgMY68kwdQYL KoZIhvcNAQkQAgsxZqBkMF0xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQx DDAKBgNVBAsTA0RvRDEMMAoGA1UECxMDUEtJMRgwFgYDVQQDEw9ET0QgRU1BSUwgQ0EtMjkCAxjr yTANBgkqhkiG9w0BAQEFAASCAQBRdaurzdl68ZueXLtLBniKR1WmFKw23P40P7LIZdOowG051Q6N YZ/ekalbnk7sDezYd8sbPEmc5Ax6rHcvXpj41CV3KPL6KWHhGD74Oe/NN+tMnZ59JeBeEF3lRphh /p+20qzu6KlMS5DD6s8xUw6+eI5UbyHDDwaRXDhCs4rvTyVotfusAExGe4QWTI6kZ7Sjv52ECwnB /XJ/bobftGTICBi5V/pYw0KFVxv7UuCvNPOSrOzbdg0R8XCUMu9fhO0iIJduIUP3OkRfUiIhHNjR soPdSg0EEDSkJ0AS3UBoQwsp+40Dcf+c9DZT60JnzccasfyaPmcwoDSu2nRLVFnKAAAAAAAA ------=_NextPart_000_049F_01CEB8F7.10C45BE0--