On Wed, Aug 26, 2009 at 12:42 PM, Ximin Luo<xl269@xxxxxxxxx> wrote: > Hi, > > I'm have 2 separate svn projects from googlecode imported into a single git > repo. One is a semi-fork of the other, so I thought I'd be able to use git's > merge feature to repeatedly merge from the mother project (and possibly vice > versa too). > > However, this doesn't happen. I "git pull" and this works fine, but when I "git > svn dcommit" back into svn, this rewrites my git history and it loses track of > the merge (and next time I try to pull, the same conflicts appear). > > For now I just have a .git/info/grafts, but this doesn't get exported anywhere, > so if other people "git svn clone" from svn, or "git clone" from my git repo, > they don't get the merge information. > > It would be nice if git-svn saved the merge info somewhere instead of getting > rid of it. #git tells me this is impossible at the moment, hence the mail. > Relevant parts of the convo are pasted below. > > I understand if this is a low priority, but I don't think it would be a major > PITA to implement (some suggestions are listed in the convo log). And it'd be > useful for people converting from svn to git. > > Thanks for your time. > > X > > P.S. please don't troll me. For the particular use case you have, I suspect svk would be a better tool for merging between those two projects... git-svn is rather specifically designed to only deal with a single upstream repository, you see, and it isn't very easy to change this to accept multiple repos. -- 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