From: Alexandre T. <kt...@fr...> - 2003-03-18 14:05:18
|
Please disregard previous message; rollback procedure successfully =20 completed. Back to normal operation. Sorry for the inconvenience. > > Le samedi, 15 mar 2003, =E0 14:25 Europe/Paris, Grzegorz Jakacki a =E9c= rit =20 > : > >> Alexandre Tolmos writes: >> >>> I'm not expert at using Cvs and I see no command to do a rollback; =20 >>> can you help? >> >> Wow, it is harder that I thougt (or maybe I am missing something). >> This is what I came up with: >> (1) Check out working copy >> cvs co opencxx >> cd opencxx >> [sticky tag: none, sticky date: none] >> (2) Use 'cvs log' on one of files that need rollback to >> find out to what date you want to roll back. >> [sticky tag: none, sticky date: none] >> (3) Go back to the rollback date, e.g. >> cvs update -D'2003/03/15 12:07:26 UTC' >> WARNING: Remember to specify "UTC". 'cvs status' give you times in = =20 >> UTC, >> but other commands accept date in your local time, unless you =20 >> specify >> UTC. >> [sticky tag: none, sticky date: 2003.03.15.12.07.26] >> (3) Tag the rollback point: >> cvs tag sandbox_USERID_rollback_point >> [sticky tag: none, sticky date: 2003.03.15.12.07.26] >> (4) Get head revision in your working dir >> cvs update -A >> [sticky tag: none, sticky date: none] >> (5) Branch out a sandbox >> cvs tag -b sandbox_USERID_rollback_result >> [sticky tag: none, sticky date: none] >> (6) Switch to sandbox >> cvs update -r sandbox_USERID_rollback_result >> [sticky tag: sandbox_USERID_rollback_result, sticky date: none] >> (7) Merge reversed changes from rollback point >> to rollback result into rollback_result branch >> cvs update \ >> -jsandbox_USERID_rollback_result \ >> -jsandbox_USERID_rollback_point >> WARNING: Order of '-j' options is essential! >> [sticky tag: sandbox_USERID_rollback_result, sticky date: none] > > The merging does not work: > > bash-2.05a$ cvs update -jsandbox_kthulhu_rollback_result =20 > -jsandbox_kthulhu_rollback_point > kt...@cv...'s password: > cvs [server aborted]: no such tag sandbox_kthulhu_rollback_point > > Alex > > -----------------------------------------------------------------------= =20 > -- > Alexandre Tolmos > E-mail:=A0...@fr... > ICQ: 92964905 > -----------------------------------------------------------------------= =20 > -- > "Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn." > -----------------------------------------------------------------------= =20 > -- > > > > > ------------------------------------------------------------------------=20 - Alexandre Tolmos E-mail:=A0...@fr... ICQ: 92964905 ------------------------------------------------------------------------=20 - "Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn." ------------------------------------------------------------------------=20 - |