9:18 p.m.
Using
----------------------------------------------------------------------------
(emacs-version)
"XEmacs 21.4 (patch 6) \"Common Lisp\" [Lucid] (i586-pc-win32) of Mon
Dec 17 2001 on D5DC120J"
uname -a
CYGWIN_NT-5.0 D5DC120J 1.3.2(0.39/3/2) 2001-05-20 23:28 i686 unknown
cvs -v
Concurrent Versions System (CVS) 1.11 (client/server)
Copyright (c) 1989-2000 Brian Berliner, david d `zoo' zuhn,
Jeff Polk, and other authors
CVS may be copied only under the terms of the GNU General Public License,
a copy of which can be found with the CVS distribution kit.
Specify the --help option for further information about CVS
----------------------------------------------------------------------------
I am getting these conflicts:
cvs server: Updating doc/html/jde-ug/images
cvs update: move away doc/html/jde-ug/images/Keybindings.gif; it is in the way
C doc/html/jde-ug/images/Keybindings.gif
cvs update: move away doc/html/jde-ug/images/jdemenu.gif; it is in the way
C doc/html/jde-ug/images/jdemenu.gif
----------------------------------------------------------------------------
pcl-cvs reports different case for these files:
PCL-CVS release v2_9_9
Repository: :pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs
Working directory: c:\Hacking\XEmacs\packages\xemacs-packages\jde\
In directory .:
In directory doc/html/bsh-ug/images:
In directory doc/html/bsh-ug:
In directory doc/html/css:
In directory doc/html/jdb-ug/images:
In directory doc/html/jdb-ug:
Message: cvs update: move away doc/html/jde-ug/images/Keybindings.gif; it is in the way
Conflict doc/html/jde-ug/images/Keybindings.gif
Message: cvs update: move away doc/html/jde-ug/images/jdemenu.gif; it is in the way
Conflict doc/html/jde-ug/images/jdemenu.gif
In directory doc/html/jde-ug/images:
In directory doc/html/jde-ug:
Any clues what the cause of this could be?
Best regards,
Adrian
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
4:06 a.m.
>>>> "APA" == Adrian Aichner
<adrian(a)xemacs.org> writes:
APA> I am getting these conflicts:
APA> cvs server: Updating doc/html/jde-ug/images
APA> cvs update: move away doc/html/jde-ug/images/Keybindings.gif; it is in 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.
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Don't ask how you can "do" free software business;
ask what your business can "do for" free software.
3:09 p.m.
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
11:15 a.m.
It will be something to do with the fact that the files should be binary.
Try deleting the files and updating.
andy
At 10:18 PM 1/5/2002 +0100, Adrian Aichner wrote:
Using
----------------------------------------------------------------------------
(emacs-version)
"XEmacs 21.4 (patch 6) \"Common Lisp\" [Lucid] (i586-pc-win32) of Mon
Dec 17 2001 on D5DC120J"
uname -a
CYGWIN_NT-5.0 D5DC120J 1.3.2(0.39/3/2) 2001-05-20 23:28 i686 unknown
cvs -v
Concurrent Versions System (CVS) 1.11 (client/server)
Copyright (c) 1989-2000 Brian Berliner, david d `zoo' zuhn,
Jeff Polk, and other authors
CVS may be copied only under the terms of the GNU General Public License,
a copy of which can be found with the CVS distribution kit.
Specify the --help option for further information about CVS
----------------------------------------------------------------------------
I am getting these conflicts:
cvs server: Updating doc/html/jde-ug/images
cvs update: move away doc/html/jde-ug/images/Keybindings.gif; it is in the way
C doc/html/jde-ug/images/Keybindings.gif
cvs update: move away doc/html/jde-ug/images/jdemenu.gif; it is in the way
C doc/html/jde-ug/images/jdemenu.gif
----------------------------------------------------------------------------
pcl-cvs reports different case for these files:
PCL-CVS release v2_9_9
Repository: :pserver:cvs＠cvs.xemacs.org:/pack/xemacscvs
Working directory: c:\Hacking\XEmacs\packages\xemacs-packages\jde\
In directory .:
In directory doc/html/bsh-ug/images:
In directory doc/html/bsh-ug:
In directory doc/html/css:
In directory doc/html/jdb-ug/images:
In directory doc/html/jdb-ug:
Message: cvs update: move away doc/html/jde-ug/images/Keybindings.gif; it
is in the way
Conflict doc/html/jde-ug/images/Keybindings.gif
Message: cvs update: move away doc/html/jde-ug/images/jdemenu.gif; it is
in the way
Conflict doc/html/jde-ug/images/jdemenu.gif
In directory doc/html/jde-ug/images:
In directory doc/html/jde-ug:
Any clues what the cause of this could be?
Best regards,
Adrian
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
8355
days inactive
8357
days old
3 comments
4 participants
participants (4)
-
Adrian Aichner -
Andy Piper -
Jeff Mincy -
Stephen J. Turnbull