Fossil

Check-in [496c0fea]
Login

Check-in [496c0fea]

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

Overview
Comment:Fix for lockup on merge with rename and custom baseline. Change received from drh via mailing list. See http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg23838.html for details.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 496c0fea3b4d48252171011fa34af7f917a05ca8
User & Date: jan.nijtmans 2016-09-07 07:50:49
Context
2016-09-07
10:12
Fix mingw64 build (broken by [8f2dd0106ef3b5aa]) ... (check-in: db59821f user: jan.nijtmans tags: trunk)
08:05
(cherry-pick) Fix for lockup on merge with rename and custom baseline. Change received from drh via mailing list. See http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg23838.html for details. ... (check-in: 8166001e user: jan.nijtmans tags: branch-1.35)
07:50
Fix for lockup on merge with rename and custom baseline. Change received from drh via mailing list. See http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg23838.html for details. ... (check-in: 496c0fea user: jan.nijtmans tags: trunk)
2016-09-06
19:24
Possible fix for lockup on merge with rename and (maybe?) custom baseline (exact reasons for lockup not 100% known), resolves issue with my (private) repository. Change received from drh via mailing list. See http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg23838.html for details. ... (Closed-Leaf check-in: 0120be34 user: andygoth tags: merge-rename-lockup)
2016-09-01
01:44
Add REMOTE_HOST to the test_env page. ... (check-in: 4d1f2d30 user: mistachkin tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/merge.c.

︙︙
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407

  if( load_vfile_from_rid(pid) && !forceMissingFlag ){
    fossil_fatal("missing content, unable to merge");
  }
  if( zPivot ){
    vAncestor = db_exists(
      "WITH RECURSIVE ancestor(id) AS ("
      "  VALUES(%d)"
      "  UNION ALL"
      "  SELECT pid FROM plink, ancestor"
      "   WHERE cid=ancestor.id AND pid!=%d AND cid!=%d)"
      "SELECT 1 FROM ancestor WHERE id=%d LIMIT 1",
      vid, nid, pid, pid
    ) ? 'p' : 'n';
  }
  if( debugFlag ){








|








393
394
395
396
397
398
399
400
401
402
403
404
405
406
407

  if( load_vfile_from_rid(pid) && !forceMissingFlag ){
    fossil_fatal("missing content, unable to merge");
  }
  if( zPivot ){
    vAncestor = db_exists(
      "WITH RECURSIVE ancestor(id) AS ("
      "  VALUES(%d)"
      "  UNION"
      "  SELECT pid FROM plink, ancestor"
      "   WHERE cid=ancestor.id AND pid!=%d AND cid!=%d)"
      "SELECT 1 FROM ancestor WHERE id=%d LIMIT 1",
      vid, nid, pid, pid
    ) ? 'p' : 'n';
  }
  if( debugFlag ){
︙︙