Avery Pennarun <apenwarr@xxxxxxxxx> writes: > You can minimize the impact of this problem, however. The easiest way is: > > - have only a single person use git-svn > > - when committing stuff to git-svn, first checkout the *existing* > git-svn branch, then use "git merge --no-ff mybranch", then "git svn > dcommit". The --no-ff is very important; this makes sure that a *new* > commit is created (a merge commit) for the svn dcommit. svn dcommit > then creates only a single svn commit that includes all the patches > from the whole branch. > > - then do 'git checkout mybranch; git merge git-svn' to get the svn commit back. > > At work, we have a cronjob that basically does most of these steps for > us. Then there's a central git repo that corresponds to the svn repo; > people who want to use git can use that repo and not worry about > git-svn. Do you happen to have the cron script available for perusal anywhere? I imagine many of the details would need to be changed for other installations, but just looking at a working concrete example could be very helpful... Thanks, -Miles -- ===== (^o^; (())) *This is the cute octopus virus, please copy it into your sig so it can spread. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html