Re: Merging bug (wrong conflicts)

[Jacob Burckhardt]

Derek R. Price writes:
> Jacob Burckhardt wrote:
> > ... large files would be in sanity.sh if we wanted to follow the
> > current system that sanity.sh uses to test merges.  The current system
> > is to echo the contents of the file and redirect the echo command to a
> > file.  For example:
> >
> > echo "contents of
> > file to
> > be merged" > file_to_be_merged
> 
> Here-docs and escaped here-docs are easier for long texts:
> 
> 
>      cat >file <<EOF
>      text
>      text
>      text
>      EOF
> 
> and
> 
> 
>      cat >file <<\EOF
>      text
>      text
>      text
>      EOF
> 
> The EOF can be an arbitrary string and the \ tells the shell not to perform 
> shell
> substitutions.

Thanks.  I think that will be helpful.

> 
> 
> > cp cvs/src/file_to_be_merged ${TESTDIR}/working_dir
> >
> > Another idea is to have sanity.sh use the expression $0 to get the
> > pathname of sanity.sh, and then it removes the sanity.sh from that
> 
> Not _completely_ a bad thing, though I might like to hear some other opinions 
> on the
> matter.  I think I would try and avoid it though, if you can.  On the other 
> hand, if
> the files are _really_ big, then maybe it is best.  How many lines are they - 
> min,
> max, average?

I first reported that I had 8 test cases, but a co-worker recently
gave me a 9nth case.

4 test cases have files of less that 26 lines.
4 test cases have sizes ranging from 600 to 2,000 lines
1 test case has files of 10,000 lines

Obviously the first 4 cases are small enough to be directly in
sanity.sh.  Then next 4 are probably too big and the last one is
defiantly too big.  I will try to see if some cases are testing
similar things, and if so, I will eliminate the redundant cases.  If I
still think I need some of the big ones, I will try to make them
smaller.  I'll work on reducing it for a few hours, but if it still
seems difficult, I will let you know if I think I need to put the cases
in separate files instead of directly in sanity.sh.