aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* White space cleanup & debug statmentsTorgny Nyblom2010-09-041-34/+34
|
* Merge branch 'master' of git://gitorious.org/svn2git/svn2gitRaja R Harinath2010-08-241-1/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | The conflict was mainly around two different approaches to fixing the linear commitMarks issue. The precise tracking of commit marks per branch is better, and that's how I resolved the merge conflict. While at it, I also removed the "revision-*" files, since the "log-*" files already have the same information, and the branch information too. Conflicts: src/repository.cpp src/repository.h
| * Allow comments (start with '#') in accounts mapJosé Manuel Santamaría Lema2010-06-211-1/+5
| |
* | Provide a way to merge repositoriesRaja R Harinath2010-07-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose you have multiple repositories in SVN that you want to merge into a single one in GIT, it can get very messy to handle all the special-case rules. Instead, we introduce a new "forwarding repository" concept, which looks like repository subordinate repository unified prefix foo/ end repository This forwards all commits on the "subordinate" SVN tree to the "unified" GIT tree, with each file prefixed with "foo/".
* | Extract out public methods of Repository into an abstract base classRaja R Harinath2010-07-221-1/+1
| | | | | | | | Rename Repository to FastImportRepository. We will be introducing new types soon.
* | Make the new incremental mode permanentRaja R Harinath2010-07-191-25/+21
| | | | | | | | | | With the changes made to Repository::reloadBranches when --incremental was introduced, the older mode wasn't working, anyway.
* | Make error handling of --incremental and --resume-from idempotentRaja R Harinath2010-07-111-14/+30
| | | | | | | | | | | | | | | | | | | | | | When --resume-from failed in incremental mode, the log files that detected the error condition were truncated. So, if the same command line was executed again, the invocation would go through. We now restore the log files from backup when we detect we're going to fail. The restored log files may not all be the same as we originally started with, but we only truncate information that would anyway be truncated on the next successful run.
* | make --incremental robust to inconsistent import directoriesRaja R Harinath2010-07-101-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | An interrupted import (say with Ctrl-C) can leave the import directory in an inconsistent state. This can be due to checkpointing fast-import only occassionally, but updating log-* files immediately, and/or other reasons. The incremental mode can detect certain such situations and rewind back to a safe state. Note that since the default commit-interval is quite large, this rewind can end up backtracking a lot. Note also that import interrupted under the control of svn2git, say, for missing rules should leave the import directory in a consistent state for the purpose of svn2git.
* | Introduce incremental mode with --incremental flagRaja R Harinath2010-07-091-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | We use the progress logs that we carefully maintained to recreate the branch data structures, as described in earlier commits. A major change/improvement is that reloadBranches() now uses the marks file and internal data structures to prime the fast-import rather than using git-rev-parse. We also handle --resume-from properly, by truncating the log file to revisions that only precede the revision resumed from. Note that git fast-import allows marks to be reused without any extra processing.
* | Exit with EXIT_FAILURE if svn.exportRevision() failedRaja R Harinath2010-07-011-4/+8
|/
* Add support for git-svn author filesSebastian Pipping2010-03-271-1/+8
|
* Add command line option to print what rules are used on each file.Torgny Nyblom2010-03-251-0/+1
|
* Add commandline option for when to flush the commit queue.Torgny Nyblom2010-03-251-0/+1
|
* Change license on files where I am copyright holder to GPLv3.Thiago Macieira2010-03-031-1/+1
| | | | | The GPLv2 is incompatible with the Apache 2.0 License used in the SVN libs. So everyone was using this software under the GPLv3 anyway. Formalise it now.
* make dry-run a command line switch instead of a compile-time switchThomas Zander2009-10-211-1/+1
|
* Replace options with the one from vng and use its options for better usabilityThomas Zander2009-10-211-10/+48
|
* Don't let me waste 2 hours doing an import if the identity map file wasn't ↵Thiago Macieira2009-07-201-1/+4
| | | | found...
* Add support for annotated tagsThiago Macieira2009-06-081-1/+5
|
* General improvements and reload branches automatically when starting ↵Thiago Macieira2008-08-181-2/+0
| | | | git-fast-import
* Implement the identity mapThiago Macieira2007-12-281-0/+26
|
* Support an upper limit of revision numbersThiago Macieira2007-12-241-1/+3
|
* Add support for resuming workThiago Macieira2007-12-241-3/+11
|
* Add a better option-parserThiago Macieira2007-12-241-7/+5
|
* Fix crashes and improve behaviourThiago Macieira2007-12-241-1/+1
|
* Handle errors correctlyThiago Macieira2007-12-231-1/+2
|
* And run the SVN code tooThiago Macieira2007-12-231-0/+11
|
* Add SVN codeThiago Macieira2007-12-231-8/+0
|
* Add main.cppThiago Macieira2007-12-231-0/+55
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-13 08:49:42 +0000