diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2010-06-21 19:08:23 +0530 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2010-06-21 20:41:04 +0530 |
| commit | 5092b0eb41426803022338c9f9709b2119da93e9 (patch) | |
| tree | d0e7f9c28c833424611d547bf5b26efee9abcc83 /src | |
| parent | e2ec9569986d22624a3e73d174b62c7b18a67380 (diff) | |
| download | svn2git-5092b0eb41426803022338c9f9709b2119da93e9.tar svn2git-5092b0eb41426803022338c9f9709b2119da93e9.tar.gz svn2git-5092b0eb41426803022338c9f9709b2119da93e9.tar.bz2 svn2git-5092b0eb41426803022338c9f9709b2119da93e9.tar.xz svn2git-5092b0eb41426803022338c9f9709b2119da93e9.zip | |
Add --force to 'git fast-import' command-line
Now that we support arbitrarily reseating branches, the branch can be
reset to older SVN revisions or derive from a different branch point.
The "only fast-forward" rule of git branch imports gets in our way.
Note that the application of the rule is fairly unpredictable since the
checking happens only at 'checkpoint's.
Let's trust our handling of SVN history and override the sanity-check.
Note that we don't lose any information since reseated branches are
snapshotted before reset.
Diffstat (limited to 'src')
| -rw-r--r-- | src/repository.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/repository.cpp b/src/repository.cpp index d0e1a60..e31cf23 100644 --- a/src/repository.cpp +++ b/src/repository.cpp @@ -301,7 +301,7 @@ void Repository::startFastImport() fastImport.setProcessChannelMode(QProcess::MergedChannels); if (!CommandLineParser::instance()->contains("dry-run")) { - fastImport.start("git", QStringList() << "fast-import" << "--relative-marks" << "--import-marks=marks" << "--export-marks=marks"); + fastImport.start("git", QStringList() << "fast-import" << "--relative-marks" << "--import-marks=marks" << "--export-marks=marks" << "--force"); } else { fastImport.start("/bin/cat", QStringList()); } |