Larry Jones wrote:
jehan.procaccia writes:Great I've managed to "rollback" to a stable revision with the above doc.
How can I cancel my last commit ?
The best option is to use a merge to back out the changes and then commit again. See the manual for details:
<https://www.cvshome.org/docs/manual/cvs-1.11.18/cvs_5.html#SEC62>
-Larry Jones
Sometimes I think the surest sign that intelligent life exists elsewhere
in the universe is that none of it has tried to contact us. -- Calvin
Now I want to keep that stable revision in production, and create a branch for new/beta features so I tagged that revision :
[EMAIL PROTECTED] /var/www/html/ldap/trombintDev] $ cvs tag -c trombint-2-0-0 .
I want to keep patching if needed that production revision an keep developping new features, so I created a branch:
$ cvs rtag -b -r trombint-2-0-0 trombint-2-0-0-patches trombintDev
From the CVS doc I can see how to update from any different branch : https://www.cvshome.org/docs/manual/cvs-1.11.18/cvs_5.html#SEC57
But how do I commit to one branch or an other ? When working on the production files, I want to commit to branch "trombint-2-0-0-patches" and when I work on the "new features working set" I want to commit to "trombint-2-0-0" branch ! The problem is that the "new features working set" was checked out before I tagged and branched the repository. I read from online doc https://www.cvshome.org/docs/manual/cvs-1.11.18/cvs_16.html#SEC126 section :
A.9.2.2 Creating the branch after editing
[[ hacked sources are present ]] $ cvs tag -b EXPR1 $ cvs commit -r EXPR1
Is this what I should run in my current "new features working set" which includes lot of changes and new files compare to the production revision that I just tagged ?
Thanks for the advice ...
_______________________________________________ Info-cvs mailing list [email protected] http://lists.gnu.org/mailman/listinfo/info-cvs
