Fossil

Check-in [1c4d1272]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment: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].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 1c4d1272a621bbd58b39d034698b872109653ed8
User & Date: drh 2011-06-14 23:59:04
References
2011-06-15
07:43 Ticket [554f44ee] Interbranch interference with merges and renames status still Open with 1 other change artifact: 14c30ffd user: viriketo
Context
2011-06-15
15:22
Update the built-in SQLite to the latest 3.7.7 beta. check-in: dbe1e68e user: drh tags: trunk
2011-06-14
23:59
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]. check-in: 1c4d1272 user: drh tags: trunk
22:31
Disable several warnings about sorting w/o an index. check-in: b893eb0d user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/path.c.

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;