On 26/03/2012 06:31, Marvin Humphrey wrote:
On Sun, Mar 25, 2012 at 1:18 PM, Nick Wellnhofer<[email protected]> wrote:
I use git-svn and my usual workflow is to simply rebase a branch on top of
trunk with git locally, and then replay all the commits one by one. This is
pretty easy to do and avoids the hassle of svn merges.
+1, that works.
Things have gotten a little messy because I just uploaded a 5-patch sequence
eliminating the autogeneration of Autobinding.pm to LUCY-215. If I commit
those to your branch and then you replay them later, we wind up associating
the wrong committer with the commits. Not the end of the world, but definitly
not desirable.
OK, then I'll merge the changes in my branch. They shouldn't affect the
normal Lucy build anyway.
Nick
