I've been reading some things about git-svn and am wondering if it could be
used to manage vendor branches where both the upstream and local
repositories are in svn (don't ask, I didn't set this stuff up).
My situation looks something like this:
upstream repo (svn)
trunk
tags
release-1.0
release-1.1
release-1.2
...
branches
release-1.0
release-1.1
release-1.2
...
local repo (svn, copy of upstream via svn_load_dirs)
trunk
tags
branches
release-5.6
release-5.7
...
In the past, we have updated our local trunk from the upstream trunk via
svn_load_dirs/svnmerge. This works ok. Not good by any means but it's
at least functional.
The problem really gets unsolvable with svn when you start looking at
merging from upstream *branches.* In that case, what's in the branch/tag
is something that appears nowhere on the upstream trunk. At some point
it was branched from trunk and stuff was cherry-picked into it from trunk as
bugs were fixed for release. So one can't just do an svn_load_dirs from
trunk at the point of the branch/tag. And one can't svn_load_dirs from a
release branch and then svn_load_dirs from trunk later because svn_load_dirs
by its very nature aggregates lots of individual revisions into one giant one.
There's no way to do the merge without a horrible number of conflicts, most
of which are spurious.
We really do need to merge from a release branch into our local repository
and in the future do merges from later release branches or from trunk.
If everything was in git, this would all be nearly trivial.
But it's not and I have to deal with it.
Now, there is a git mirror of the upstream repository, presumably kept in
sync via git-svn. So my question is, can I somehow do a git-clone of this
repository and then use git-svn to "bounce" it into our local svn repository
to do merges? My reading so far tells me "no" but I wanted to check with
the gurus. I believe git-svn only knows about one svn repository and in
this case it would be the upstream svn that feeds the public git mirror.
I don't know how people handle this kind of need with svn.
Thanks for your help!
-Dave
--
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
