Re: Merging bug (wrong conflicts)

[Derek R. Price]

Jacob Burckhardt wrote:

> Derek R. Price writes:
>
> > Here-docs and escaped here-docs are easier for long texts:
>
> Thanks.  I think that will be helpful.

You're welcome.  :)


> 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.

I agree.


> 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.

The short test cases might hold clues as to common causes for these errors?

Karl, you managed to fix the algorithm without knowing what file configurations 
cause
spurious conflicts?

If files do end up needing to be copied, I think the compromise might be that 
when the
files can't be found, the tests pass anyhow, perhaps with a warning in the log.

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:dprice@openavenue.com     OpenAvenue ( http://OpenAvenue.com )
--
Laws that forbid the carrying of arms...  disarm only those who are neither
inclined nor determined to commit crimes...  Such laws make things worse for
the assaulted and better for the assailants; they serve rather to encourage
than to prevent homicides, for an unarmed man may be attacked with greater
confidence than an armed man.

                        - Thomas Jefferson, quoting Cesare Beccaria