This change allows certain refs to be ignored while importing svn
history. This is useful for:
- Performing overlapping transforms from svn's branch namespace into
git's namespace. The overlapping refs can be ignored. It might
potentially be a better idea in this case to make git-svn assign
precedence according to the order in which the branch patterns are
specified, perhaps with an option to trigger that behavior (which
is out of scope for this patch series).
- Avoiding some refs that represent bad svn operations which cause
git-svn to take a very long time. Example: copying one module
accidentally into another module's branch namespace.
A new config directive called "ignore-refs" implements this feature by
means of a regex of refs to ignore. I haven't written the necessary
git-svn documentation updates for it yet.
In addition, I ran across a problem where git-svn would die if a
parent ref did not exist. This might possibly have been exposed as a
result of the first patch. I threw an eval around the offending code,
and that seems to work, though some review would be appreciated.
Here is an example ~/.git/config file which works with these changes.
The example upstream svn repository has branches in tags in 2
different namespaces. Originally all tags/branches were directly
under /root/mod/branches and /root/mod/tags. Later on, they created
new branches and tags in subdirectories such as
/root/mod/branches/myorg/bugs/BUGID. This config file forces
old-style branches and tags into the "old/" namespace in git, and puts
new-style branches and tags into (for example) "myorg/bugs/BUGID".
The "ignore-refs" directive prevents the first level of the new
namespace ("myorg", in particular) from being replicated underneath
"old/" in git.
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[svn-remote "svn"]
url = https://svn.my.org/svn/root
fetch = mod/trunk:refs/remotes/trunk
branches = mod/branches/*:refs/remotes/old/*
tags = mod/tags/*:refs/remotes/tags/old/*
branches = mod/branches/myorg/bugs/*:refs/remotes/myorg/bugs/*
tags = mod/tags/myorg/bugs/*:refs/remotes/tags/myorg/bugs/*
branches = mod/branches/myorg/projects/*:refs/remotes/myorg/projects/*
tags = mod/tags/myorg/projects/*:refs/remotes/tags/myorg/projects/*
branches = mod/branches/myorg/releases/*:refs/remotes/myorg/releases/*
tags = mod/tags/myorg/releases/*:refs/remotes/tags/myorg/releases/*
ignore-refs = ^refs/remotes/(tags/)?old/myorg
Michael Olson (2):
git-svn: Allow certain refs to be ignored
git-svn: Don't allow missing commit parent to stop git-svn
git-svn.perl | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html