Fossil

Check-in [08ed91a7]
Login

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

Overview
Comment:Mention the --force option in import's help.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | git-better-import
Files: files | file ages | folders
SHA1:08ed91a7b21e9b3c8f7c2afa8dbb245cfa3ab611
User & Date: isaac.jurado 2013-06-25 17:40:55
Context
2013-06-25
17:49
Sort options alphabetically and show short options too. check-in: 61fb03f9 user: isaac.jurado tags: git-better-import
17:40
Mention the --force option in import's help. check-in: 08ed91a7 user: isaac.jurado tags: git-better-import
2013-06-17
21:44
Changes from Isaac Jurado that record renames on an import from git. check-in: 97d8a08a user: drh tags: git-better-import
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/import.c.

721
722
723
724
725
726
727
728

729
730
731

732
733
734
735
736
737
738
** argument.  The git-fast-export text is read from standard input.
**
** The git-fast-export file format is currently the only VCS interchange
** format that is understood, though other interchange formats may be added
** in the future.
**
** The --incremental option allows an existing repository to be extended
** with new content.

**
** Options:
**   --incremental  allow importing into an existing repository

**
** See also: export
*/
void git_import_cmd(void){
  char *zPassword;
  FILE *pIn;
  Stmt q;







|
>



>







721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
** argument.  The git-fast-export text is read from standard input.
**
** The git-fast-export file format is currently the only VCS interchange
** format that is understood, though other interchange formats may be added
** in the future.
**
** The --incremental option allows an existing repository to be extended
** with new content.  Otherwise, if a file with the same name as NEW-REPOSITORY
** is found, the command fails unless the --force option is used.
**
** Options:
**   --incremental  allow importing into an existing repository
**   --force        remove existing file
**
** See also: export
*/
void git_import_cmd(void){
  char *zPassword;
  FILE *pIn;
  Stmt q;