Fossil

Check-in [d70ea01c83]
Login

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

Overview
Comment:When "open" warn about already existing files, also mention -k (--keep) as an alternative to -f (--force).
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: d70ea01c83ff75694865872e432b8c6dd0480ad3d769409083778083566d79c0
User & Date: mgagnon 2021-10-29 18:22:38.660
Context
2021-11-02
15:52
Work around a warning in older versions of OpenSSL (e.g. 1.0.2g) where ASN1_time_check() is declared with a non-const ASN1_TIME* parameter. check-in: af8109c00d user: danield tags: trunk
2021-10-29
18:22
When "open" warn about already existing files, also mention -k (--keep) as an alternative to -f (--force). check-in: d70ea01c83 user: mgagnon tags: trunk
17:05
Retrieve the value of an SQL count(*) as an integer, not a float (discovered by accident while playing with compiler warnings). check-in: 735b6be7ea user: danield tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/db.c.
3580
3581
3582
3583
3584
3585
3586


3587
3588
3589
3590
3591
3592
3593
3594
  }
  if( keepFlag==0
   && bForce==0
   && (nLocal = file_directory_size(".", 0, 1))>0
   && (nLocal>1 || isUri || !file_in_cwd(zRepo))
  ){
    fossil_fatal("directory %s is not empty\n"


                 "use the -f or --force option to override", file_getcwd(0,0));
  }

  if( db_open_local_v2(0, allowNested) ){
    fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
  }

  /* If REPOSITORY looks like a URI, then try to clone it first */







>
>
|







3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
  }
  if( keepFlag==0
   && bForce==0
   && (nLocal = file_directory_size(".", 0, 1))>0
   && (nLocal>1 || isUri || !file_in_cwd(zRepo))
  ){
    fossil_fatal("directory %s is not empty\n"
                 "use the -f (--force) option to override\n"
                 "or the -k (--keep) option to keep local files unchanged", 
                 file_getcwd(0,0));
  }

  if( db_open_local_v2(0, allowNested) ){
    fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
  }

  /* If REPOSITORY looks like a URI, then try to clone it first */