On 01/02/11 23:06, Thomas Ferris Nicolaisen wrote: > Hi Graham, > > I think you're saying, that you don't need to do any "git svn dcommit" > in your git-svn clone.
That is correct. This sounds like the Git repo is a pure "read > only mirror" of the Subversion project. Such a setup is quite > straight-forward and won't give any problems. Good! > > However, as far as I understand, you want to do commits in the git repo, > making a few differences compared to the state in subversion (so yes, > like you say, it's a branch of the code in svn). In this case, the > danger lies in the regular pain of branching: Over time as you do more > commits on the git side, each "git svn rebase" will stack your git > commits historically on top of the commits that come from the Subversion > side. Over time, you'll get a large set of git-commits that have to be > replayed on top of the subversion updates, and chances of getting > conflicts will increase, making it more and more painful to keep the git > repo in sync with the latest changes from subversion (this is the same > problems you run into when trying to maintain two branches in parallel, > I guess). > I think your description is what I'm expecting. At the moment I'm working directly on the subversion checkout (no git involved), doing a daily svn update from the remote subversion, and resolving any conflicts with my local changes manually. Periodically if I think a set of local changes will be accepted into the remote trunk I create a set of patches for them and mail them off for vetting. If they're accepted the difference between my local checkout and the remote repository shrinks for a while. This is tedious (especially creating the patch files) but does work, and I was assuming I could carry on doing this while working with git. The new thing I need, which has pushed me towards git, is that management want me to develop two different versions of the application for evaluation, so I want to combine the above situation with managing two branches, and thought this would be easier with git. Plus I want to learn it anyway. > So, I'm still wondering if you really want to do what you want to do :) > Well, I hope so - does the above make more sense? Graham > -- > You received this message because you are subscribed to the Google > Groups "Git for human beings" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/git-users?hl=en. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
