Differences From Artifact [5979683d08]:

• File src/merge.c — part of check-in [36b96b8616] at 2007-11-16 20:42:31 on branch trunk — Rework the merge algorithm. It now only works for text files. But, it no longer gets confused by line endings (\r\n versus \n) and it reports conflicts. (user: drh size: 8957) [more...]

To Artifact [1bca64b642]:

• File src/merge.c — part of check-in [76f169fca6] at 2009-12-18 00:29:51 on branch trunk — Detect when the check-out contains missing files and filesystem objects that ought to be files but are not. Issue reasonable warnings. (user: drh size: 8960)

75
76
77
78
79
80
81
82
83
84
85
86
87
88
89

  if( pid<=0 ){
    fossil_panic("cannot find a common ancestor between the current"
                 "checkout and %s", g.argv[2]);
  }
  if( pid>1 && !db_exists("SELECT 1 FROM plink WHERE cid=%d", pid) ){
    fossil_panic("not a version: record #%d", mid);
  }
  vfile_check_signature(vid);
  db_begin_transaction();
  undo_begin();
  load_vfile_from_rid(mid);
  load_vfile_from_rid(pid);

  /*
  ** The vfile.pathname field is used to match files against each other.  The

|

75
76
77
78
79
80
81
82
83
84
85
86
87
88
89

  if( pid<=0 ){
    fossil_panic("cannot find a common ancestor between the current"
                 "checkout and %s", g.argv[2]);
  }
  if( pid>1 && !db_exists("SELECT 1 FROM plink WHERE cid=%d", pid) ){
    fossil_panic("not a version: record #%d", mid);
  }
  vfile_check_signature(vid, 1);
  db_begin_transaction();
  undo_begin();
  load_vfile_from_rid(mid);
  load_vfile_from_rid(pid);

  /*
  ** The vfile.pathname field is used to match files against each other.  The