Fossil SCM
Allow files to be converted to symlinks and vice versa without an intermediate check-in to delete them
Commit
e0aebc21c67c583c02ac72d14fcc9cca4cb7cb14d6e679da91d77475f2745e61
Parent
9d75d6ae887d17e…
1 file changed
+1
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2510,11 +2510,11 @@ | ||
| 2510 | 2510 | ** table. If there were arguments passed to this command, only |
| 2511 | 2511 | ** the identified files are inserted (if they have been modified). |
| 2512 | 2512 | */ |
| 2513 | 2513 | db_prepare(&q, |
| 2514 | 2514 | "SELECT id, %Q || pathname, mrid, %s, %s, %s FROM vfile " |
| 2515 | - "WHERE chnged==1 AND NOT deleted AND is_selected(id)", | |
| 2515 | + "WHERE chnged IN (1, 7, 9) AND NOT deleted AND is_selected(id)", | |
| 2516 | 2516 | g.zLocalRoot, |
| 2517 | 2517 | glob_expr("pathname", db_get("crlf-glob",db_get("crnl-glob",""))), |
| 2518 | 2518 | glob_expr("pathname", db_get("binary-glob","")), |
| 2519 | 2519 | glob_expr("pathname", db_get("encoding-glob","")) |
| 2520 | 2520 | ); |
| 2521 | 2521 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2510,11 +2510,11 @@ | |
| 2510 | ** table. If there were arguments passed to this command, only |
| 2511 | ** the identified files are inserted (if they have been modified). |
| 2512 | */ |
| 2513 | db_prepare(&q, |
| 2514 | "SELECT id, %Q || pathname, mrid, %s, %s, %s FROM vfile " |
| 2515 | "WHERE chnged==1 AND NOT deleted AND is_selected(id)", |
| 2516 | g.zLocalRoot, |
| 2517 | glob_expr("pathname", db_get("crlf-glob",db_get("crnl-glob",""))), |
| 2518 | glob_expr("pathname", db_get("binary-glob","")), |
| 2519 | glob_expr("pathname", db_get("encoding-glob","")) |
| 2520 | ); |
| 2521 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2510,11 +2510,11 @@ | |
| 2510 | ** table. If there were arguments passed to this command, only |
| 2511 | ** the identified files are inserted (if they have been modified). |
| 2512 | */ |
| 2513 | db_prepare(&q, |
| 2514 | "SELECT id, %Q || pathname, mrid, %s, %s, %s FROM vfile " |
| 2515 | "WHERE chnged IN (1, 7, 9) AND NOT deleted AND is_selected(id)", |
| 2516 | g.zLocalRoot, |
| 2517 | glob_expr("pathname", db_get("crlf-glob",db_get("crnl-glob",""))), |
| 2518 | glob_expr("pathname", db_get("binary-glob","")), |
| 2519 | glob_expr("pathname", db_get("encoding-glob","")) |
| 2520 | ); |
| 2521 |