From: Guilhem Bonnefille Date: Tue, 01 May 2007 17:30:01 GMT Subject: Re: git-svn and local only topic branch Message-ID: <8b65902a0705011030l43d693fcoa831f1764cbbfb58@mail.gmail.com> In-Reply-To: <0E0C5313-0DCA-4DE5-96C5-9AD74758B68A@apple.com> On 5/1/07, Adam Roben wrote: > On May 1, 2007, at 9:40 AM, Guilhem Bonnefille wrote: > > I'm using Git as a SVN frontend (via git-svn). Recently, I made a > > topic branch, I did some job on it and wish to "upload" my work (on > > the SVN). But, I do not want "pushing" all commits, I only want to > > create a single commit on the SVN, while keeping full commits on my > > Git repo. But I did not find how to do this. > > If you just want to make a commit to Subversion containing all the > changes on your branch, then you should be able to do this: > > git svn commit-diff upstream topic > > That will take the entire diff between upstream and your topic > branch and make one commit to Subversion containing that diff. Yes, I want to make a single commit on Subversion containing all the changes of my topic branch. But I also want to keep track of this "merge" in my local Git repo. So I want that the new commit on my upstream branch store an ancestry with both upstream and topic branches. I fear that "commit-diff" will only produce a commit on SVN, that will be stored as a single and normal commit on my (local) upstream branch. -- Guilhem BONNEFILLE -=- #UIN: 15146515 JID: guyou@im.apinc.org MSN: guilhem_bonnefille@hotmail.com -=- mailto:guilhem.bonnefille@gmail.com -=- http://nathguil.free.fr/