On Mon, 2002-11-25 at 13:11, Peter Donald wrote: > On Mon, 25 Nov 2002 22:44, Leo Simons wrote: > > jakarta-avalon-excalibur/containerkit | avalon-sandbox/containerkit > > leave it as is because I have oodles of changes that I need to check in first. > Not sure when I will get a chance - possibly wend evening.
you mean in the sense of "have time to submit patch" or "I'll have access to the cvs box and time to do surgery"? > > jakarta-avalon-excalibur/info | avalon-sandbox/meta/info > > You mean avalon-sandbox/info right? nope, not what I ment...what I'll settle for if needed for consensus :D the o.a.e.meta.info package is mostly the same as o.a.f.info. The hidden agenda is to merge 2 revolutions into one....or at least make as clear as possible the obvious relation between the two. > > jakarta-avalon-excalibur/xfc | > > avalon-sandbox/xfc > > I would like to keep this in excalibur proper - at least for now. It needs to > be integrated into Fortress so that Fortress can the same stuff as ecm hosts. > After that I think we can move to completely deprecating ECM and pointing at > fortress. ok. Didn't know there's close coupling with fortress. > > jakarta-avalon-excalibur/extension > > Don't want that moved. It is not released but it is stable and has been for > more than a year and is used in Phoenix. gotcha. > > However, it seems the stuff I mentioned is all so unstable it is sort-of > > okay not to keep the cvs history? (The history would still be available > > in the attic of the excalibur cvs.) > > I want to keep the cvs history for info/containerkit. You can keep it by doing > something like > > ssh cvs.apache.org > $ cd /home/cvs/jakarta-avalon-sandbox > $ cp -R ../jakarta-avalon-excalibur/info . > $ cp -R ../jakarta-avalon-excalibur/containerkit . > $ chown -R leosimons.jakarta info containerkit > $ chmod -R [inset proper perms here] info containerkit I figured it out....gotta love google. Note that cp has a -p option that preserves permissions 'n stuff. The problem seems to be that checkout -D<blah> will get problems. following snippet from: http://www.loria.fr/cgi-bin/molli/fom.cgi?_highlightWords=renaming&file=287 By stripping off all the old Tags, "checkout -r" and "update -r" won't retrieve revisions Tagged before the renaming. cd [working-dir]/[ndir] cvs update [nfile] cvs log [nfile] # Save the list of Tags cvs tag -d [tag1] [nfile] cvs tag -d [tag2] [nfile] . . . This technique can be used to rename files within one directory or across different directories. You can apply this idea to directories too, as long as you apply the above to each file and don't delete the old directory. Of course, you have to change your build system (e.g. Makefile) in your [working-dir] to know about the name change. Warning: Stripping the old tags from the copied file will allow "-r [tag]" to do the right thing, but you will still have problems with "-D [date]" because there is no place to store the "deletion time". See 5B.3 for more details. ----- If the mentioned problems are not problems for us then IIUC commands would be along the lines of: ####################################### ssh [EMAIL PROTECTED] # apache cvs box cd /home/cvs/avalon-sandbox cp -Rp jakarta-avalon-excalibur/containerkit . exit # back to local box cd ~/projects/avalon/jakarta-avalon-excalibur/ cvs tag -R PRE_MOVE_TO_SANDBOX containerkit/ cvs remove -R containerkit rm -Rf containerkit cvs commit -R containerkit -m 'removal explanation' cd ../avalon-sandbox cvs update -d cd containerkit/ cvs log > cvs_history.txt cvs tag -R -d SOME_TAG containerkit/ # for all tags cvs add cvs_history.txt cvs commit -m "history up to $currentdate, including tags" \ cvs_history.txt cvs remove cvs_history.txt cvs commit -m 'move history to attic' cvs_history.txt rm cvs_history.txt ####################################### which I'll happily do ;) cheers, - Leo -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
