Apache OpenOffice (AOO) Bugzilla – Issue 33405
cvs strangeness on windows
Last modified: 2005-09-09 10:11:04 UTC
Please don't mix upper and lower case filenames that are in every other aspect identical. $ alias alias oosshcvs='cvs -z 3 -d :pserver:vq@localhost:/cvs' $ rm -rf sd/source/ui/inc $ oosshcvs up -Cd -A -rSRC680_m51 sd/source/ui/inc cvs server: Updating sd/source/ui/inc U sd/source/ui/inc/3dchld.hxx U sd/source/ui/inc/AccessibleDocumentViewBase.hxx ... U sd/source/ui/inc/docprev.hxx cvs update: move away sd/source/ui/inc/drawview.hxx; it is in the way C sd/source/ui/inc/drawview.hxx U sd/source/ui/inc/effect.hrc U sd/source/ui/inc/enumdlg.hrc cvs update: move away sd/source/ui/inc/fader.hxx; it is in the way C sd/source/ui/inc/fader.hxx U sd/source/ui/inc/filedlg.hxx ... U sd/source/ui/inc/sdxfer.hxx cvs update: move away sd/source/ui/inc/showview.hxx; it is in the way C sd/source/ui/inc/showview.hxx U sd/source/ui/inc/slidechg.hrc And now the funny part: $ oosshcvs status sd/source/ui/inc/DrawView.hxx =================================================================== File: DrawView.hxx Status: Up-to-date Working revision: 1.5 Repository revision: 1.5 /cvs/graphics/sd/source/ui/inc/drawview.hxx,v Note that the file name in my working copy is with capital D and V, and Up-to-date to the lower case drawview.hxx. The same applies for fader.hxx and showview.hxx. But some files are even not available anymore (this is iz29695), try $ oosshcvs up -Cd -A -rcws_srx645_ooo113fix2 offapi/com/sun/star/util/color.idl and $ ls offapi/com/sun/star/util/color.idl ls: offapi/com/sun/star/util/color.idl: No such file or directory
Please have a look.
Oh oh! Updating 'res' to tag 'SRC680_m51' ... C commandimagelist/lc_bold.png C commandimagelist/lc_charfontname.png C commandimagelist/lc_color.png C commandimagelist/lc_drawtext.png C commandimagelist/lc_fontcolor.png .. 455 lines deleted .. C commandimagelist/zh-TW/sc_bold.png C commandimagelist/zh-TW/sc_italic.png C commandimagelist/zh-TW/sc_underline.png C commandimagelist/zh-TW/sc_underlinedouble.png C commandimagelist/zh-TW/sch_bold.png C commandimagelist/zh-TW/sch_underline.png C commandimagelist/zh-TW/sch_underlinedouble.png Conflict(s): 467
I forgot to mention all of the conflicts are of the "cvs update: move away <filename>; it is in the way" type.
Simple words were requested in IRC ;) Here is what I did. I patched my cvs client (version 1.11.6) to monitor all that is send to the server and also the commands that are coming back. Testcase: mycvs -d :pserver:vq@localhost:/cvs up -Cd -A -rSRC680_m51 sd/source/ui/inc Observations: * With sd/source/ui/inc/ShowView.hxx (and showview.hxx) missing: The server sends sd/source/ui/inc/ShowView.hxx and afterwards sends sd/source/ui/inc/showview.hxx complaining that it already exists. It shouldn't send it. * With sd/source/ui/inc/ShowView.hxx present: The cvs client reports the correct filenames and versions from CVS/Entries to the server, but the cvs server decides to update to sd/source/ui/inc/showview.hxx but fails. Now the really funny part, make it think that windows has a case sensitive file system by changing FILENAMES_CASE_INSENSITIVE in cvsclientsource/lib/system.h to: #undef FILENAMES_CASE_INSENSITIVE Now remove the sd/source/ui/inc dir and update it again. You will get no more conflicts and you get /showview.hxx/1.4/Mon Jul 12 15:12:16 2004//TSRC680_m51 the correct version and only once: It looks like a problem on the server side when the client sends the info that he is not case sensitive, something for collab ;)
To make this clear: > * With sd/source/ui/inc/ShowView.hxx (and showview.hxx) missing: > The server sends sd/source/ui/inc/ShowView.hxx and afterwards sends > sd/source/ui/inc/showview.hxx complaining that it already exists. > It shouldn't send it. The server should send only showview.hxx for this tag and not ShowView.hxx, but he creates/sends revision 1.4 of showview.hxx (correct) and names it ShowView.hxx (wrong). Then he finds showview.hxx ... Confusing?
mh->vq: the combination to update with "-A -r tag" does only make limited sense. Does the behavior change without -A ? which version of cvs client do you use. I got similar results with cvs 1.11.6, but no messages with 1.12.9.
-A was a testing artifact ;) $ cvs.exe -z 3 -d :pserver:vq@localhost:/cvs up -Cd -rSRC680_m51 sd/source/ui/inc cvs server: Updating sd/source/ui/inc cvs update: move away sd/source/ui/inc/DrawView.hxx; it is in the way C sd/source/ui/inc/DrawView.hxx I'll try 1.12.9 over the weekend and push the cygwin maintainer if it cures the problem. Thanks.
Ok, cvs 1.12.x is the unstable branch, but cvs 1.11.17 is the last stable release. I build it for cygwin and I can confirm that the "cvs update: move away <filename>; it is in the way" problem is gone. It is also possible to get color.idl from iz29695. I'll close this issue once the new version is officially available for cygwin.
*** Issue 29695 has been marked as a duplicate of this issue. ***
cvs 1.11.17 is available as cygwin package.
close
*** Issue 54383 has been marked as a duplicate of this issue. ***