conflicts-130 fails

[Pavel Roskin]

Hello!

conflicts-130 fails on the today's CVS on RedHat 7.0 with ReiserFS (the
later may be suggestive, since it doesn't sort the files automatically).
However, the CVS from CVS passed "make check" few days ago on the same
machine.

This is the relevant part of the log:

PASS: conflicts-129a
** expected:
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/a,v
retrieving revision 1\.1
retrieving revision 1\.2
Merging differences between 1\.1 and 1\.2 into a
rcsmerge: warning: conflicts during merge
cvs [a-z]*: conflicts found in a
C a
? dir1
? sdir
** or:
? dir1
? sdir
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/a,v
retrieving revision 1\.1
retrieving revision 1\.2
Merging differences between 1\.1 and 1\.2 into a
rcsmerge: warning: conflicts during merge
cvs [a-z]*: conflicts found in a
C a
** got:
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/a,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into a
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in a
C a
? sdir
? dir1
FAIL: conflicts-130

You see, "? sdir" comes before "? dir1". I believe that dotest_sort would
be the right solution. The problem with dotest_sort is the it doesn't sort
the expected output, which is necessary since the line beginning with
${PROG} can be in different places dependent on the value of ${PROG}.

Regards,
Pavel Roskin