Differences From Artifact [acd6b62bd6]:

• File src/path.c — part of check-in [e805fa8db9] at 2011-04-27 18:21:51 on branch windows-i18n — Attempt to get Fossil working on windows systems that do not use UTF8 in the shell. (user: drh size: 12401) [more...]

To Artifact [acae303e19]:

• File src/path.c — part of check-in [1c4d1272a6] at 2011-06-14 23:59:04 on branch trunk — When doing a merge, only follow direct ancestor links when computing the set of filename changes. Do not follow merge links as this can result in non-intuitive changes. Ticket [554f44ee74e3d3b]. (user: drh size: 12401) [more...]

364
365
366
367
368
369
370
371
372
373
374
375
376
377
378

  int i;                   /* Loop counter */
  Stmt q1;                 /* Query of name changes */

  *pnChng = 0;
  *aiChng = 0;
  if( iFrom==iTo ) return;
  path_reset();
  p = path_shortest(iFrom, iTo, 0);
  if( p==0 ) return;
  path_reverse_path();
  db_prepare(&q1,
     "SELECT pfnid, fnid FROM mlink WHERE mid=:mid AND pfnid>0"
  );
  for(p=path.pStart; p; p=p->u.pTo){
    int fnid, pfnid;

|

364
365
366
367
368
369
370
371
372
373
374
375
376
377
378

  int i;                   /* Loop counter */
  Stmt q1;                 /* Query of name changes */

  *pnChng = 0;
  *aiChng = 0;
  if( iFrom==iTo ) return;
  path_reset();
  p = path_shortest(iFrom, iTo, 1);
  if( p==0 ) return;
  path_reverse_path();
  db_prepare(&q1,
     "SELECT pfnid, fnid FROM mlink WHERE mid=:mid AND pfnid>0"
  );
  for(p=path.pStart; p; p=p->u.pTo){
    int fnid, pfnid;