mercurial/mpatch.c
changeset 34634 2e08b69bcd29
parent 34633 347c0f4232e1
child 34800 761355833867
equal deleted inserted replaced
34633:347c0f4232e1 34634:2e08b69bcd29
    76 		postend = offset + s->start + s->len;
    76 		postend = offset + s->start + s->len;
    77 		if (postend <= cut) {
    77 		if (postend <= cut) {
    78 			/* save this hunk */
    78 			/* save this hunk */
    79 			offset += s->start + s->len - s->end;
    79 			offset += s->start + s->len - s->end;
    80 			*d++ = *s++;
    80 			*d++ = *s++;
    81 		}
    81 		} else {
    82 		else {
       
    83 			/* break up this hunk */
    82 			/* break up this hunk */
    84 			c = cut - offset;
    83 			c = cut - offset;
    85 			if (s->end < c)
    84 			if (s->end < c)
    86 				c = s->end;
    85 				c = s->end;
    87 			l = cut - offset - s->start;
    86 			l = cut - offset - s->start;
   120 
   119 
   121 		postend = offset + s->start + s->len;
   120 		postend = offset + s->start + s->len;
   122 		if (postend <= cut) {
   121 		if (postend <= cut) {
   123 			offset += s->start + s->len - s->end;
   122 			offset += s->start + s->len - s->end;
   124 			s++;
   123 			s++;
   125 		}
   124 		} else {
   126 		else {
       
   127 			c = cut - offset;
   125 			c = cut - offset;
   128 			if (s->end < c)
   126 			if (s->end < c)
   129 				c = s->end;
   127 				c = s->end;
   130 			l = cut - offset - s->start;
   128 			l = cut - offset - s->start;
   131 			if (s->len < l)
   129 			if (s->len < l)