Fossil

Check-in [2ff70a31]
Login

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

Overview
Comment:Modify commit error message about unresolved merge conflicts to include the option used to disable the check.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:2ff70a313088a4ff9a4adb74a846e2d5605e2051
User & Date: mistachkin 2012-11-26 20:47:17
Context
2012-11-26
22:51
Merge byte-order-mark handling enhancements to trunk. check-in: 9b800ee4 user: mistachkin tags: trunk
22:47
merge trunk check-in: f05090e5 user: jan.nijtmans tags: ticket-d17d6e5b17
20:47
Modify commit error message about unresolved merge conflicts to include the option used to disable the check. check-in: 2ff70a31 user: mistachkin tags: trunk
20:40
Make the --force option to commit undocumented. Add --allow-empty, --allow-fork, and --allow-older options. Rename the --conflict option to --allow-conflict. Remove the --binary-ok option. check-in: 5e83504f user: mistachkin tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/checkin.c.

1330
1331
1332
1333
1334
1335
1336
1337

1338
1339
1340
1341
1342
1343
1344
      content_deltify(rid, nrid, 0);
    }
    db_multi_exec("UPDATE vfile SET mrid=%d, rid=%d WHERE id=%d", nrid,nrid,id);
    db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nrid);
  }
  db_finalize(&q);
  if( nConflict && !allowConflict ){
    fossil_fatal("abort due to unresolved merge conflicts");

  }

  /* Create the new manifest */
  if( blob_size(&comment)==0 ){
    blob_append(&comment, "(no comment)", -1);
  }
  if( forceDelta ){







|
>







1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
      content_deltify(rid, nrid, 0);
    }
    db_multi_exec("UPDATE vfile SET mrid=%d, rid=%d WHERE id=%d", nrid,nrid,id);
    db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nrid);
  }
  db_finalize(&q);
  if( nConflict && !allowConflict ){
    fossil_fatal("abort due to unresolved merge conflicts; "
                 "use --allow-conflict to override");
  }

  /* Create the new manifest */
  if( blob_size(&comment)==0 ){
    blob_append(&comment, "(no comment)", -1);
  }
  if( forceDelta ){