Overview
| SHA1 Hash: | 8d5ab7913e4d06e074a6769079b6d16a343eef07 |
|---|---|
| Date: | 2009-01-21 03:12:14 |
| User: | drh |
| Comment: | Do not print a warning about "a fork has occurred" when checking in to a leaf that is also the basis of a branch. |
| Timelines: | ancestors | descendants | both | trunk |
| Other Links: | files | ZIP archive | manifest |
Tags And Properties
- branch=trunk inherited from [a28c83647d]
- sym-trunk inherited from [a28c83647d]
Changes
[hide diffs]Modified src/checkin.c from [e3023f8a1f] to [daf07ead77].
@@ -644,11 +644,11 @@
/* Commit */
db_end_transaction(0);
autosync(AUTOSYNC_PUSH);
- if( db_exists("SELECT 1 FROM plink WHERE pid=%d AND cid!=%d", vid, nvid) ){
+ if( count_nonbranch_children(vid)>1 ){
printf("**** warning: a fork has occurred *****\n");
}
}
/*