How do I manage this setup with git-svn and/or git remotes?
- From
David Kastrup <dak@gnu.org>
- Date
- Aug 17, 2007, 17:24 UTC
- Message-ID
- <86y7gaxef5.fsf@lola.quinscape.zz>
I have a Subversion repository which contains the following:
https://repo.here/svn/dsp/{trunk,tags,branches} and https://repo.here/svn/projects/great/{trunk/tags/branches}
I have those currently checked out into separate git repositories. However,
https://repo.here/svn/projects/great/{trunk/tags/branches}contain a subdirectory dsp that has been copied via Subversion from the main dsp trunk. Subsequently this copy and the original dsp have progressed.
Now is there any chance to set up a git structure that will me allow to let _git_ perform merges between the standalone dsp project and the part that has started off as a copy of it in a subdirectory from projects/great, so that I have a merge history in my git mirror?
Or is basically the only thing I can do to create selective patches and apply them, thus not tracking the merges?
-- David Kastrup