On Mon, Mar 21, 2011 at 6:14 PM, Bostjan Skufca <bost...@a2o.si> wrote: >> Can you explain how it would have made your life easier for rebasing >> code if we were using Git instead of SVN? > With git, my workflow would be: > - clone repo > - checkout tag 3.1.7 > - apply external patch > - commit > - rebase to HEAD > - format patch and send it (or even better, send a pull request) > > Do you see a comparatively easy approach in SVN where original patch > just won't apply because code offsets were through the roof compared > to context included in a diff and manual page states you can't > increase fuzz factor (offset search) above number of context lines?
What I would have done, that would have been no easier than what you did, would be to get a local svn checkout of HEAD, git init it and commit it, then svn checkout the branch (or branches that interest me) one at a time, import to git branch(es), and then generate a commit of your local change and cherry-pick it to each of the branches, if possible. I've never messed with any of the git<->svn tools before, I don't know if they would be helpful or not. -- Regards... Todd "It is the nature of the human species to reject what is true but unpleasant and to embrace what is obviously false but comforting." "The chief source of problems is solutions." ------------------------------------------------------------------------------ Enable your software for Intel(R) Active Management Technology to meet the growing manageability and security demands of your customers. Businesses are taking advantage of Intel(R) vPro (TM) technology - will your software be a part of the solution? Download the Intel(R) Manageability Checker today! http://p.sf.net/sfu/intel-dev2devmar _______________________________________________ Ganglia-general mailing list Ganglia-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ganglia-general
