To Martin Costabel & Chris Devers - I had, indeed, modified the libxml2 info file, so I followed Martin's instructions, deleted the file, updated the cvs, then re-ran the update and all went well.
Also, by pointing out what some of those codes mean, you allowed me to troubleshoot this problem should it show up again. Many thanks for your clear & prompt assistance. On 09/29/2002 10:38, "Martin Costabel" <[EMAIL PROTECTED]> wrote: > Chris Devers wrote: >> On Sun, 29 Sep 2002, Michael Frankel wrote: > [] > > I can see a "conflict" here: > >> cvs server: Updating 10.2/unstable/main/finkinfo/libs >> C 10.2/unstable/main/finkinfo/libs/libxml2-2.4.23-4.info > > The "C" means "conflict". It is strange that there was no explanation. > Usually cvs tells why it thinks there is a conflict. In any case it is a > good idea to remove this file and to check it out again (unless you > modified it and want to conserve your modification): > > cd /sw/fink/dists/unstable/main/finkinfo/libs > rm libxml2-2.4.23-4.info > cvs up > > If you are curious, you can run > > cvs status libxml2-2.4.23-4.info > > before removing the file. -- Michael Frankel Director of Technology Stolen Apple Productions, LLC (818) 508-7090 / Cell (888) 291-3419 http://www.stolenapple.com ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Fink-users mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/fink-users
