From: Jonathan Nieder Date: Mon, 18 Oct 2010 16:56:31 GMT Subject: Re: Converting to Git using svn-fe (Was: Speeding up the initial git-svn fetch) Message-ID: <20101018165631.GA6718@burratino> In-Reply-To: Sverre Rabbelier wrote: > I'm thinking we can just refuse to let through a commit that is > non-linear, as if there's a hook on the server side that rejects such > a history. Since we're representing the svn remote as a regular > remote, the user can just do 'git rebase @{u}" themselves if they end > up with a non-linear history. Sounds good to me! FWIW I just wanted to make sure people don't forget about the incompatible object models. The pretend-upstream-has-a-vicious-update-hook approach sounds like a sane way to deal with this for pushing from git to svn (like (III) but making the user do more of the work). Pulling from svn is a harder problem but luckily the single-upstream case is the usual case (so object model mismatches are easier to cope with as long as one can find the corresponding svn rev number for a given git object easily).