[ Apologies for the delay in responding... :-( ] On Thu, Jun 01, 2006 at 04:41:33PM -0700, Mark D. Baushke wrote: >Hi Steve, > >I added the following patch to the cvs-1.12.13/src/sanity.sh to try to >test your problem. I am still unable to reproduce your error. > >Does running > > sh sanity.sh `which cvs-1.12.13` conflicts4 > >work for you or not?
No, it fails: FAIL: conflicts4-8 check.log shows: find_tool: id version_test id_tool_test Running version_test /usr/bin/id id (coreutils) 5.2.1 Written by Arnold Robbins and David MacKenzie. Copyright (C) 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. PASS: version_test /usr/bin/id Running id_tool_test /usr/bin/id PASS: id_tool_test /usr/bin/id Using ID=/usr/bin/id find_tool: expr:gexpr version_test expr_tooltest1 expr_tooltest2 expr_tooltest3 expr_set_ENDANCHOR expr_set_DOTSTAR expr_tooltest_DOTSTAR Running version_test /usr/bin/expr expr (GNU coreutils) 5.2.1 Written by Mike Parker. Copyright (C) 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. PASS: version_test /usr/bin/expr Running expr_tooltest1 /usr/bin/expr PASS: expr_tooltest1 /usr/bin/expr Running expr_tooltest2 /usr/bin/expr PASS: expr_tooltest2 /usr/bin/expr Running expr_tooltest3 /usr/bin/expr PASS: expr_tooltest3 /usr/bin/expr Running expr_set_ENDANCHOR /usr/bin/expr Notice: An ENDANCHOR of dollar does not work. Using a workaround for GNU expr versions 1.9.4 thru 1.12 PASS: expr_set_ENDANCHOR /usr/bin/expr Running expr_set_DOTSTAR /usr/bin/expr PASS: expr_set_DOTSTAR /usr/bin/expr Running expr_tooltest_DOTSTAR /usr/bin/expr PASS: expr_tooltest_DOTSTAR /usr/bin/expr Using EXPR=/usr/bin/expr Using ENDANCHOR=\' Using DOTSTAR=.* find_tool: tr:gtr version_test tr_tooltest1 Running version_test /usr/bin/tr tr (coreutils) 5.2.1 Written by Jim Meyering. Copyright (C) 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. PASS: version_test /usr/bin/tr Running tr_tooltest1 /usr/bin/tr PASS: tr_tooltest1 /usr/bin/tr Using TR=/usr/bin/tr find_tool: ls:gls version_test ls_tooltest Running version_test /bin/ls ls (coreutils) 5.2.1 Written by Richard Stallman and David MacKenzie. Copyright (C) 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. PASS: version_test /bin/ls Running ls_tooltest /bin/ls PASS: ls_tooltest /bin/ls Using LS=/bin/ls find_tool: gawk:nawk:awk version_test awk_tooltest1 awk_tooltest2 Running version_test /usr/bin/gawk GNU Awk 3.1.4 Copyright (C) 1989, 1991-2003 Free Software Foundation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. PASS: version_test /usr/bin/gawk Running awk_tooltest1 /usr/bin/gawk 27 PASS: awk_tooltest1 /usr/bin/gawk Running awk_tooltest2 /usr/bin/gawk 3 PASS: awk_tooltest2 /usr/bin/gawk Using AWK=/usr/bin/gawk PASS: init-1 PASS: init-2 PASS: conflicts4-1 Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository PASS: conflicts4-2 PASS: conflicts4-3 cvs-1.12.13 add: use `cvs-1.12.13 commit' to add this file permanently PASS: conflicts4-4 /tmp/cvs-sanity/cvsroot/first-dir/file1,v <-- file1 initial revision: 1.1 PASS: conflicts4-5 U file1 PASS: conflicts4-6 /tmp/cvs-sanity/cvsroot/first-dir/file1,v <-- file1 new revision: 1.2; previous revision: 1.1 PASS: conflicts4-7 ** expected: RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v retrieving revision 1\.1 retrieving revision 1\.2 Merging differences between 1\.1 and 1\.2 into file1 rcsmerge: warning: conflicts during merge cvs update: conflicts found in file1 ** got: RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v retrieving revision 1.1 retrieving revision 1.2 Merging differences between 1.1 and 1.2 into file1 rcsmerge: warning: conflicts during merge cvs-1.12.13 update: conflicts found in file1 FAIL: conflicts4-8 -- Steve McIntyre, Cambridge, UK. [EMAIL PROTECTED] Who needs computer imagery when you've got Brian Blessed?
signature.asc
Description: Digital signature
_______________________________________________ info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
