Calendar:Updating libical: Difference between revisions
Jump to navigation
Jump to search
No edit summary |
No edit summary |
||
| Line 6: | Line 6: | ||
* copy the relevant source files into a 'clean' directory. (without the CVS dirs etc) | * copy the relevant source files into a 'clean' directory. (without the CVS dirs etc) | ||
* go into this libical dir (outside any mozilla tree) and do the following: | * go into this libical dir (outside any mozilla tree) and do the following: | ||
cvs -d :ext:user%my.cvs.email.addr@cvs.mozilla.org:/cvsroot import -m 'update to libical cvs on 2005xxxx' mozilla/calendar/libical SOURCEFORGE_DIST LIBICAL_0_24RC_CVS_2005xxxx | cvs -d :ext:user%my.cvs.email.addr@cvs.mozilla.org:/cvsroot import -m 'update to libical cvs on 2005xxxx' \ | ||
mozilla/calendar/libical SOURCEFORGE_DIST LIBICAL_0_24RC_CVS_2005xxxx | |||
* hope that everything is allright | * hope that everything is allright | ||
if there are conflicts: | if there are conflicts: | ||
* go to the mozilla tree (one directory above mozilla) | * go to the mozilla tree (one directory above mozilla) | ||
cvs -d :ext:user%my.cvs.email.addr@cvs.mozilla.org:/cvsroot checkout -jLIBICAL_0_24RC_CVS_2005yyyy -jLIBICAL_0_24RC_CVS_2005xxxx mozilla/calendar/libical/src/libical/icalrecur.c | cvs -d :ext:user%my.cvs.email.addr@cvs.mozilla.org:/cvsroot checkout -jLIBICAL_0_24RC_CVS_2005yyyy \ | ||
-jLIBICAL_0_24RC_CVS_2005xxxx mozilla/calendar/libical/src/libical/icalrecur.c | |||
* fix conflicts. (likely $id$ related) | * fix conflicts. (likely $id$ related) | ||
* check in the fixed version | * check in the fixed version | ||
Revision as of 21:33, 15 February 2005
mozilla/calendar/libical is a cvs import of the libical cvs tree.
steps to update: (make sure fo fill in the xxxx and yyyy parts. xxxx is today, yyyy comes from cvs log)
- Get an updated libical tree (from sourceforge: :pserver:anonymous@cvs.sourceforge.net:/cvsroot/freeassociation, module libical)
- copy the relevant source files into a 'clean' directory. (without the CVS dirs etc)
- go into this libical dir (outside any mozilla tree) and do the following:
cvs -d :ext:user%my.cvs.email.addr@cvs.mozilla.org:/cvsroot import -m 'update to libical cvs on 2005xxxx' \ mozilla/calendar/libical SOURCEFORGE_DIST LIBICAL_0_24RC_CVS_2005xxxx
- hope that everything is allright
if there are conflicts:
- go to the mozilla tree (one directory above mozilla)
cvs -d :ext:user%my.cvs.email.addr@cvs.mozilla.org:/cvsroot checkout -jLIBICAL_0_24RC_CVS_2005yyyy \ -jLIBICAL_0_24RC_CVS_2005xxxx mozilla/calendar/libical/src/libical/icalrecur.c
- fix conflicts. (likely $id$ related)
- check in the fixed version