Re: cancel the last commit

Pierre Asselin wrote: I was wondering if I could do something simpler: 2) Get the trunk code [EMAIL PROTECTED] /var/www/html/ldap] $ cvs -d :pserver:[EMAIL PROTECTED]:/var/cvs checkout -r trombint-2-0-0 trombintDev Yes, much easier, but see below. OK, good that's what I finally did w

Re: cancel the last commit

Jehan PROCACCIA <[EMAIL PROTECTED]> wrote: > [ ... ] > $ cvs -d :pserver:[EMAIL PROTECTED]:/var/cvs update -A > [ ... ] > RCS file: /var/cvs/trombintDev/easyExtract.php,v > retrieving revision 1.3 > retrieving revision 1.4 > Merging differences between 1.3 and 1.4 into easyExtract.php > easyExtrac

Re: cancel the last commit

Pierre Asselin wrote: and when I work on the "new features working set" I want to commit to "trombint-2-0-0" branch correction, commit to the trunk. "trombint-2-0-0" is not a branch, it's a (set of) revisions and you can't commit to that. Do a cvs update -A and try a "cvs status" again.

Re: cancel the last commit

jehan.procaccia <[EMAIL PROTECTED]> wrote: > 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 or a branch for the *stable* codeline, leaving the new/beta stuff on the tru

Re: cancel the last commit

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 thin

RE: cancel the last commit

Jehan, Changes to the repository are final - however you can rollback your work area (sandbox) to the previous state, and then commit these "changes". If you are using Windows then you are probably using CVSNT (also available for Linux/Unix/Mac for free). CVSNT has transactions which allow you

Re: cancel the last commit

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