Differences From Artifact [c290110112]:
- File src/import.c — part of check-in [3a6c848f68] at 2015-02-25 16:09:34 on branch svn-import — Make --git the default for "fossil import" if neither --git nor --svn is specified. Make --force work (again) with "fossil import --git". (user: jan.nijtmans size: 52560)
To Artifact [cea940fcc5]:
- File
src/import.c
— part of check-in
[c2cdd0e3e8]
at
2015-02-25 17:19:01
on branch svn-import
— Usage text only modifications:
- Mention about --force.
- Show that --git is optional (?--git?)
- Add short option (-f for --force and -i for --incremental)
(No change to the code) (user: mgagnon size: 52638)
| ︙ | ︙ | |||
1461 1462 1463 1464 1465 1466 1467 |
db_finalize(&revSrc);
fossil_print(" Done!\n");
}
/*
** COMMAND: import
**
| | | 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 |
db_finalize(&revSrc);
fossil_print(" Done!\n");
}
/*
** COMMAND: import
**
** Usage: %fossil import ?--git? ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
** or: %fossil import --svn ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
**
** Read interchange format generated by another VCS and use it to
** construct a new Fossil repository named by the NEW-REPOSITORY
** argument. If no input file is supplied the interchange format
** data is read from standard input.
**
|
| ︙ | ︙ | |||
1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 | ** --trunk FOLDER Name of trunk folder ** --branches FOLDER Name of branches folder ** --tags FOLDER Name of tags folder ** --base PATH Path to project root in repository ** --flat The whole dump is a single branch ** --no-svn-rev Omit 'snv-rev-nnn' tags on checkins ** ** The --incremental option allows an existing repository to be extended ** with new content. ** | > > > > < < | 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 |
** --trunk FOLDER Name of trunk folder
** --branches FOLDER Name of branches folder
** --tags FOLDER Name of tags folder
** --base PATH Path to project root in repository
** --flat The whole dump is a single branch
** --no-svn-rev Omit 'snv-rev-nnn' tags on checkins
**
** Common Options:
** -i|--incremental allow importing into an existing repository
** -f|--force overwrite repository if already exist
**
** The --incremental option allows an existing repository to be extended
** with new content.
**
**
** See also: export
*/
void import_cmd(void){
char *zPassword;
FILE *pIn;
Stmt q;
|
| ︙ | ︙ |