Fossil

Differences From Artifact [938bc9a668]:

• File src/merge3.c — part of check-in [1d93222627] at 2011-03-01 19:04:32 on branch trunk — Treat whitespace at the end of lines as significant during a merge. (user: drh size: 14469)

To Artifact [185ae0b338]:

• File src/merge3.c — part of check-in [e2122bd620] at 2011-03-01 22:07:59 on branch trunk — Fix merge so that it does not segfault when merging text files that do not end in \n and yet have changes at the very end. Ticket [c43d2d9477c2d59a]. (user: drh size: 14495)

37
38
39
40
41
42
43

44
45
46
47
48
49
50
51
52
53
54
55
56
57
58

** lines are different.
**
** The cursors on both pV1 and pV2 is unchanged by this comparison.
*/
static int sameLines(Blob *pV1, Blob *pV2, int N){
  char *z1, *z2;
  int i;


  if( N==0 ) return 1;
  z1 = &blob_buffer(pV1)[blob_tell(pV1)];
  z2 = &blob_buffer(pV2)[blob_tell(pV2)];
  for(i=0; z1[i]==z2[i]; i++){
    if( z1[i]=='\n' ){
      N--;
      if( N==0 ) return 1;
    }
  }
  return 0;
}

/*
** Look at the next edit triple in both aC1 and aC2.  (An "edit triple" is

>




|
|

|

37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59

** lines are different.
**
** The cursors on both pV1 and pV2 is unchanged by this comparison.
*/
static int sameLines(Blob *pV1, Blob *pV2, int N){
  char *z1, *z2;
  int i;
  char c;

  if( N==0 ) return 1;
  z1 = &blob_buffer(pV1)[blob_tell(pV1)];
  z2 = &blob_buffer(pV2)[blob_tell(pV2)];
  for(i=0; (c=z1[i])==z2[i]; i++){
    if( c=='\n' || c==0 ){
      N--;
      if( N==0 || c==0 ) return 1;
    }
  }
  return 0;
}

/*
** Look at the next edit triple in both aC1 and aC2.  (An "edit triple" is