| 00:07:49 | bug1 | andersee: is it possible to move a file in CVS and keep its history, i think ./libbb/unzip.c should be in ./archive/libunarchive |
| 00:08:29 | bug1 | it would be nice to keep its history incase any bugs pop up |
| 00:10:03 | andersee | bug1: it is for me. I can do a 'cp -a file new_spot' in the CVS archive, then do a 'cvs rm file' which does the job. |
| 00:16:48 | bug1 | andersee: could you do it sometime then, it shouldnt break anything becasue unzip is only called from ./archival/ applets, Makefile.in's will need to be changed though |
| 00:17:08 | bug1 | please |
| 00:18:00 | andersee | [andersen@winder archival]$ pwd |
| 00:18:00 | andersee | /var/www/busybox/cvs/busybox/archival |
| 00:18:00 | andersee | [andersen@winder archival]$ cp -a unzip.c,v libunarchive/ |
| 00:18:37 | andersee | You now get to do the honors of killing archival/unzip.c |
| 00:18:39 | andersee | :) |
| 00:18:48 | bug1 | also, im backing away from my attempts to do raidtools applets for now, i think upstream can be improved a fair bit first, and if someone is going to create a big raid array they probably should use the official tool |
| 00:18:53 | bug1 | k |
| 00:19:07 | andersee | k (re raidtools) |
| 00:19:52 | bug1 | raidtools can be shrunk by making a shared library and using getopt instead of popt |
| 00:21:11 | andersee | Sounds wise. |
| 00:21:26 | andersee | I never understood the redhat-sh compulsion to use popt |
| 00:23:34 | bug1 | you copied the wrong unzip.c, you copied /archival/unzip.c, you should have copied /libbb/unzip.c :) |
| 00:23:56 | andersee | oh |
| 00:23:58 | andersee | hehe |
| 00:24:42 | bug1 | confusing names.. maybe ./archival/libunarchive/inflate.c would be a better name than having two unzip.c ? |
| 00:25:24 | bug1 | but that might be confused with the old inflate program |
| 00:26:06 | andersee | 'rm -rf libunarchive' and then 'cvs up' |
| 00:26:42 | andersee | Hmm. What about libbb/uncompress.c? Shall I move it as well? |
| 00:27:45 | bug1 | hmm.. im not sure about uncompress.c, i better check |
| 00:31:28 | bug1 | did you do a rm -rf ./libunarchive ? |
| 00:33:53 | bug1 | yea uncompress can go into libunarchive as well |
| 00:37:03 | andersee | bug1: no -- if _I_ do that it'll be gone forever. You need to do that, lest cvs misbehave. |
| 00:37:49 | bug1 | i did it, but libunarchive didnt come back |
| 00:38:40 | andersee | Put this in your ~/.cvsrc: |
| 00:38:42 | andersee | -z3 |
| 00:38:42 | andersee | update -dP |
| 00:38:42 | andersee | rdiff -u |
| 00:38:42 | andersee | diff -ubBwpN |
| 00:38:42 | andersee | checkout -P |
| 00:38:55 | andersee | Then try again and see if it comes back |
| 00:43:29 | bug1 | ahh, yea that did it, thansk |
| 00:44:52 | andersee | So now do a 'cvs up' on the whole thing, check I copied the right files into libunarchive, then do a 'cvs rm libbb/uncompress.c libbb/unzip.c' |
| 00:48:51 | bug1 | i see libunarchive/uncompress.c but i dont see libunarchive/unzip.c |
| 00:56:53 | andersee | bug1: Hmm. cvs up |
| 00:57:00 | andersee | bug1: Is it there now? |
| 00:57:58 | bug1 | yes, cool |
| 00:59:38 | andersee | bug1: k. Kill the old files with a 'cvs rm', and update the Makefiles as needed. and things will be all moved. |
| 01:01:22 | bug1 | just testing before i rmeove them |
| 01:07:21 | bug1 | done |
| 03:23:26 | Neuromante | is away: al KiosKo |
| 20:07:01 | mjn3 | ok |