[bug #17560] merge code in rcs.c is O(n^2)

[Derek Robert Price]

Follow-up Comment #5, bug #17560 (project cvs):

> I think my point was i removed the white space and extra DEBUG lines that
> were in my source rcs.c file before the diff -u (I had removed those from
the
> original diff by hand a long while back).
>
> I do not believe there are any spurious WS in the diff i attached.

I did not basemy statement on yours.  I looked at the diff.  Reading up
through halfway through the second chunk, I see nothing but white space
changes.  For example:

@@ -6854,9 +6855,9 @@
     {
        if (vec->lines_alloced == 0)
            vec->lines_alloced = 10;
-       while (vec->nlines + nnew >= vec->lines_alloced)
-           vec->lines_alloced *= 2;
-       vec->vector = xnrealloc (vec->vector,
+           while (vec->nlines + nnew >= vec->lines_alloced)
+               vec->lines_alloced *= 2;
+           vec->vector = xnrealloc (vec->vector,
                                 vec->lines_alloced, sizeof (*vec->vector));
     }
 

This is, at the least, distracting, and often causes the patch algorithm to
fail.  At the least, 3/7 chunks fail applying to the trunk and 6/7 fail
applying to stable.  Though I am unsure if either of these were because of
white-space only changes, I would prefer to wait until I have a clean patch
before potentially wasting much more time looking into it.

    _______________________________________________________

Reply to this item at:

  <http://savannah.nongnu.org/bugs/?17560>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.nongnu.org/