> On Jun 3, 2015, at 7:03 PM, Jordan Justen <jordan.l.jus...@intel.com> wrote: > >> >> You can commit to svn from git. >> git svn rebase >> git svn dcommit >> git svn info > > git svn makes svn based development sane, but it is inferior. > > It doesn't really support all git features. > > It also has a natsy gotcha where equivalent branch get artificially > split. > > For example, my 'git-svn' at top-of-tree is never considered the same > as origin/master. > > This prevents things like 'git merge' from being usable. Of course, > 'git merge' can't be used with git svn anyhow... > > It also causes the source control history to be needlessly duplicated > for the two branches. > > An example of how this wastes time is that I do my development based > on the git origin/master branch. But, when it comes time to commit to > svn, I checkout the git-svn branch, run git svn rebase, cherry-pick > all the changes to the git-svn branch, and finally use git svn > dcommit. Contrast this to just running 'git push'. >
I was just throwing it out as possible solution, I did not mean to imply it was “good”. I’m wondering if you could use a pre-commit hook to merge with the git mirror and do the git-svn for you? It also looks like `git update-index --assume-unchanged` could be used to prune unwanted code out of the remote view? So maybe one big git repro could be made to work? It would be awesome if the build could generate a list of all the files used in the build, so that pruning would be easy. Thanks, Andrew Fish
------------------------------------------------------------------------------
_______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel
