On Thu, 2010-09-16 at 15:09 -0400, Justin Edelson wrote: > > Git-svn is awesome (I use it), but since a Git merge cannot be > > represented in Subversion, you aren't able to safely pull/merge/push > > with other Git repos. It basically becomes a very fancy patch > > manager when used this way. > > AFAICT, the way you workaround this is to work in a different branch > than the one connected to svn (typically master). The master branch of > my git repository which is connected to svn.apache.org is basically > pristene - whenever I'm ahead of trunk, it is because I'm about to > commit something. If I'm working on something significant, I branch, > work on the branch, and then remerge (and delete the branch). That > branch can be pushed and pulled.
Right, as long as you can maintain a linear stream of changesets that apply on top of trunk, you're good. However, if your branch has been merged with another, then you will not be able to dcommit after merging that on to trunk. See the CAVEATS section of git-svn(1) for a more. This is why I called it a patch manager, because it isn't useful for collaborating with other Git users. -- Eric Evans eev...@rackspace.com --------------------------------------------------------------------- To unsubscribe, e-mail: community-unsubscr...@apache.org For additional commands, e-mail: community-h...@apache.org
