Fossil SCM
When "open" warn about already existing files, also mention -k (--keep) as an alternative to -f (--force).
Commit
d70ea01c83ff75694865872e432b8c6dd0480ad3d769409083778083566d79c0
Parent
735b6be7ea8cc68…
1 file changed
+3
-1
M
src/db.c
+3
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -3582,11 +3582,13 @@ | ||
| 3582 | 3582 | && bForce==0 |
| 3583 | 3583 | && (nLocal = file_directory_size(".", 0, 1))>0 |
| 3584 | 3584 | && (nLocal>1 || isUri || !file_in_cwd(zRepo)) |
| 3585 | 3585 | ){ |
| 3586 | 3586 | fossil_fatal("directory %s is not empty\n" |
| 3587 | - "use the -f or --force option to override", file_getcwd(0,0)); | |
| 3587 | + "use the -f (--force) option to override\n" | |
| 3588 | + "or the -k (--keep) option to keep local files unchanged", | |
| 3589 | + file_getcwd(0,0)); | |
| 3588 | 3590 | } |
| 3589 | 3591 | |
| 3590 | 3592 | if( db_open_local_v2(0, allowNested) ){ |
| 3591 | 3593 | fossil_fatal("there is already an open tree at %s", g.zLocalRoot); |
| 3592 | 3594 | } |
| 3593 | 3595 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3582,11 +3582,13 @@ | |
| 3582 | && bForce==0 |
| 3583 | && (nLocal = file_directory_size(".", 0, 1))>0 |
| 3584 | && (nLocal>1 || isUri || !file_in_cwd(zRepo)) |
| 3585 | ){ |
| 3586 | fossil_fatal("directory %s is not empty\n" |
| 3587 | "use the -f or --force option to override", file_getcwd(0,0)); |
| 3588 | } |
| 3589 | |
| 3590 | if( db_open_local_v2(0, allowNested) ){ |
| 3591 | fossil_fatal("there is already an open tree at %s", g.zLocalRoot); |
| 3592 | } |
| 3593 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -3582,11 +3582,13 @@ | |
| 3582 | && bForce==0 |
| 3583 | && (nLocal = file_directory_size(".", 0, 1))>0 |
| 3584 | && (nLocal>1 || isUri || !file_in_cwd(zRepo)) |
| 3585 | ){ |
| 3586 | fossil_fatal("directory %s is not empty\n" |
| 3587 | "use the -f (--force) option to override\n" |
| 3588 | "or the -k (--keep) option to keep local files unchanged", |
| 3589 | file_getcwd(0,0)); |
| 3590 | } |
| 3591 | |
| 3592 | if( db_open_local_v2(0, allowNested) ){ |
| 3593 | fossil_fatal("there is already an open tree at %s", g.zLocalRoot); |
| 3594 | } |
| 3595 |