diff options
| author | Torgny Nyblom <kde@nyblom.org> | 2011-05-08 09:19:57 +0200 |
|---|---|---|
| committer | Torgny Nyblom <kde@nyblom.org> | 2011-05-08 09:19:57 +0200 |
| commit | 4c241d532e2f07c7f1c188cebebb712b752ed1ed (patch) | |
| tree | fe285061d7298746feb06825a767abd3f999ca61 /src/svn.cpp | |
| parent | e8a16c9a47eef7c625686d2a868ec91d05fd95c5 (diff) | |
| parent | c630dd763cf6ec096489bea551ca959540969c94 (diff) | |
| download | svn2git-4c241d532e2f07c7f1c188cebebb712b752ed1ed.tar svn2git-4c241d532e2f07c7f1c188cebebb712b752ed1ed.tar.gz svn2git-4c241d532e2f07c7f1c188cebebb712b752ed1ed.tar.bz2 svn2git-4c241d532e2f07c7f1c188cebebb712b752ed1ed.tar.xz svn2git-4c241d532e2f07c7f1c188cebebb712b752ed1ed.zip | |
Merge commit 'refs/merge-requests/12' of git://gitorious.org/svn2git/svn2git into merge-requests/12
Conflicts:
src/ruleparser.cpp
Diffstat (limited to 'src/svn.cpp')
| -rw-r--r-- | src/svn.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/svn.cpp b/src/svn.cpp index 09495be..c103728 100644 --- a/src/svn.cpp +++ b/src/svn.cpp @@ -214,11 +214,17 @@ static void splitPathName(const Rules::Match &rule, const QString &pathName, QSt if (repository_p) { *repository_p = svnprefix; repository_p->replace(rule.rx, rule.repository); + foreach (Rules::Match::Substitution subst, rule.repo_substs) { + subst.apply(*repository_p); + } } if (branch_p) { *branch_p = svnprefix; branch_p->replace(rule.rx, rule.branch); + foreach (Rules::Match::Substitution subst, rule.branch_substs) { + subst.apply(*branch_p); + } } if (path_p) { |