[Top][All Lists]

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

Re: cancel the last commit

From: jehan.procaccia
Subject: Re: cancel the last commit
Date: Wed, 19 Jan 2005 12:42:41 +0100
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.3) Gecko/20040922

Larry Jones wrote:

jehan.procaccia writes:
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:


-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
Great I've managed to "rollback" to a stable revision with the above doc.
Now I want to keep that stable revision in production, and create a branch for new/beta features so I tagged that revision :

address@hidden /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 :

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 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 ...

reply via email to

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