Malcolm Purvis <malcolmp(a)xemacs.org> writes:
In order to add my regressiontest.pl into the mainline I want to
merge the tests
directory from the sjt-xft branch so that the tests/autoconf directory will be
brought in.
When I run the update I get the following error:
---------------------------------------------------------------------------
silver: malcolmp$ cvs-rw -n update -jsjt-xft -d .
cvs server: Updating .
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.62.2.2
Merging differences between 1.62 and 1.62.2.2 into ChangeLog
cvs server: ChangeLog: No such file or directory
---------------------------------------------------------------------------
What's the correct way of getting tests/autoconf into the main branch?
Hi Malcolm, drop the -n I'd suggest.
I use plain cvs and here is what I get:
cd c:\Hacking\cvs.xemacs.org\XEmacs\xemacs-21.5-clean\tests\
cvs update -jsjt-xft -d .
Compilation started at Thu Mar 10 22:07:13 2005 +0100 (W. Europe Standard Time)
? automated/Test-Log-21-4-17-v.txt
? automated/Test-Log-21-5-19-v.txt
? automated/region-tests-1-1.el
cvs server: Updating .
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.62.2.2
Merging differences between 1.62 and 1.62.2.2 into ChangeLog
rcsmerge: warning: conflicts during merge
cvs server: Updating DLL
cvs server: Updating Dnd
cvs server: Updating autoconf
U autoconf/regressiontest.pl
cvs server: Updating automated
M automated/region-tests.el
cvs server: Updating gtk
cvs server: Updating mule
cvs server: Updating tooltalk
Compilation finished at Thu Mar 10 22:07:24
The modified automated/region-tests.el is my own problem :-)
Hope this helps,
Adrian
See
(info "(cvs)Global options")
if you have it installed:
`-n'
Do not change any files. Attempt to execute the `cvs_command',
but only to issue reports; do not remove, update, or merge any
existing files, or create any new files.
Note that CVS will not necessarily produce exactly the same output
as without `-n'. In some cases the output will be the same, but
in other cases CVS will skip some of the processing that would
have been required to produce the exact same output.
See also
https://ccvs.cvshome.org/source/browse/ccvs/doc/cvs.texinfo
from which I built my local cvs.info* a long time ago.
Malcolm
--
Adrian Aichner
mailto:adrianï¼ xemacs.org
http://www.xemacs.org/