Re: CVS update problem with jde package
On 07 Jan 2002, stephen(a)xemacs.org wrote:
>>>>> "APA" == Adrian Aichner
<adrian(a)xemacs.org> writes:
APA> I am getting these conflicts:
APA> cvs server: Updating doc/html/jde-ug/images cvs update:
APA> move away doc/html/jde-ug/images/Keybindings.gif; it is in
APA> the way
Shit happens---for some reason CVS doesn't believe those files are
from CVS. Take a look at their entries in CVS/Entries. It's
possible that you somehow got a broken update and Entries did not
get updated, or disk full and it got truncated, or some such.
These are binary files, so I can't imagine you've edited them,
except by accident. It is safe to delete (or move) the ones you've
got and reupdate.
Something else fishy is going on here.
For some reason, I have xemacs-packages under cvs. BUT, I am NOT
using xemacs cvs repository. When I update packages, I check in and
tag the new package. My repository lives on a sun box. Then I go to
my home windows/cygwin machine and do a cvs update from my repository.
This lets me have the same editor environment everywhere.
Anyway, After doing update a couple of times I get:
cvs update: move away html/jde-ug/images/JdeMenu.gif; it is in the way
C html/jde-ug/images/JdeMenu.gif
cvs update: move away html/jde-ug/images/Keybindings.gif; it is in the way
C html/jde-ug/images/Keybindings.gif
If I update just the .gif file by itself nothing happens, but if I
update the directory, then there are two files with conflicts.
;; conflicts
bash% cvs -q update
/usr/X11R6/bin/xauth: not found
cvs update: move away html/jde-ug/images/JdeMenu.gif; it is in the way
C html/jde-ug/images/JdeMenu.gif
cvs update: move away html/jde-ug/images/Keybindings.gif; it is in the way
C html/jde-ug/images/Keybindings.gif
;; Blow away file and update
bash% rm html/jde-ug/images/JdeMenu.gif html/jde-ug/images/Keybindings.gif
bash% cvs update html/jde-ug/images/JdeMenu.gif html/jde-ug/images/Keybindings.gif
U html/jde-ug/images/JdeMenu.gif
U html/jde-ug/images/Keybindings.gif
;; update three times, just to make sure
bash% cvs update html/jde-ug/images/JdeMenu.gif html/jde-ug/images/Keybindings.gif
/usr/X11R6/bin/xauth: not found
bash% cvs update html/jde-ug/images/JdeMenu.gif html/jde-ug/images/Keybindings.gif
/usr/X11R6/bin/xauth: not found
bash% cvs update html/jde-ug/images/JdeMenu.gif html/jde-ug/images/Keybindings.gif
/usr/X11R6/bin/xauth: not found
;; Now update the html directory
bash% cvs -q update html
cvs update: move away html/jde-ug/images/KeyBindings.gif; it is in the way
C html/jde-ug/images/KeyBindings.gif
cvs update: move away html/jde-ug/images/jdemenu.gif; it is in the way
C html/jde-ug/images/jdemenu.gif
The files have not been edited and they are both binary.
-jeff