Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch ticket-711d04b6d8 Excluding Merge-Ins
This is equivalent to a diff from 1048bccf14 to 94e2deef6d
2012-09-27
| ||
13:02 | Merge the fix for [711d04b6d8577] into trunk. Only bail out of a commit if none of the selected files have changed, rather than if any selected file is unchanged. check-in: 3a5e81cedb user: drh tags: trunk | |
11:51 | Alternative fix for ticket [711d04b6d8577]. Closed-Leaf check-in: 94e2deef6d user: drh tags: ticket-711d04b6d8 | |
08:43 | Candidate fix for ticket [711d04b6d8] check-in: eab9f88e7f user: jan.nijtmans tags: ticket-711d04b6d8 | |
01:38 | Fixes to the --tk diff option to support unified diff on Windows. check-in: 1048bccf14 user: mistachkin tags: trunk | |
00:37 | Allow unified diff for the --tk diff option. check-in: 5be507df71 user: mistachkin tags: trunk | |
Changes to src/checkin.c.
1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 |
hasChanges = unsaved_changes(); db_begin_transaction(); db_record_repository_filename(0); if( hasChanges==0 && !isAMerge && !forceFlag ){ fossil_fatal("nothing has changed"); } /* If one or more files that were named on the command line have not ** been modified, bail out now. */ if( g.aCommitFile ){ Blob unmodified; memset(&unmodified, 0, sizeof(Blob)); blob_init(&unmodified, 0, 0); db_blob(&unmodified, "SELECT pathname FROM vfile" " WHERE chnged = 0 AND origname IS NULL AND is_selected(id)" ); if( strlen(blob_str(&unmodified)) ){ fossil_fatal("file %s has not changed", blob_str(&unmodified)); } } /* ** Do not allow a commit that will cause a fork unless the --force flag ** is used or unless this is a private check-in. */ if( zBranch==0 && forceFlag==0 && g.markPrivate==0 && !is_a_leaf(vid) ){ |
| | | | | < < | | > | > | < < |
1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 |
hasChanges = unsaved_changes(); db_begin_transaction(); db_record_repository_filename(0); if( hasChanges==0 && !isAMerge && !forceFlag ){ fossil_fatal("nothing has changed"); } /* If none of the files that were named on the command line have ** been modified, bail out now unless the --force flag is used. */ if( g.aCommitFile && !forceFlag && !db_exists( "SELECT 1 FROM vfile " " WHERE is_selected(id)" " AND (chnged OR deleted OR rid=0 OR pathname!=origname)") ){ fossil_fatal("none of the selected files have changed; use -f" " or --force."); } /* ** Do not allow a commit that will cause a fork unless the --force flag ** is used or unless this is a private check-in. */ if( zBranch==0 && forceFlag==0 && g.markPrivate==0 && !is_a_leaf(vid) ){ |