From: skillzero@gmail.com Date: Sat, 22 Aug 2009 22:12:01 GMT Subject: Re: git svn pointing at svn branch instead of trunk? Message-ID: <2729632a0908221512v7d7af188h28d11a4bc8f092fc@mail.gmail.com> In-Reply-To: <20090822204627.GA22484@dcvr.yhbt.net> On Sat, Aug 22, 2009 at 1:46 PM, Eric Wong wrote: > So you have something like this? > > ----------trunk >              \ >               \-> tag > > It looks like it's mixed but that's because trunk is an ancestor of your > tag, so the majority of commits (see git-svn-id:) look like they're from > trunk except the latest git-svn-id: which should have the URL of the tag > in it.  So in short, everything here is OK. Yes, that's what I see: most of the commits have a /trunk URL except the last one has a /tags/TagX URL. When the next commit happens on master (I don't have svn commit access on the svn repo to try it myself), will git svn automatically track master->trunk again? Or is there something I need to change to tell it "master tracks svn's /trunk"? I normally do git svn fetch and git svn rebase (while on master, I do all my own commits on a separate branch). > I changed this recently in b186a261b1f7ec1fbda8c5f6d84595f3a7716d92 > git svn used to always pick the newest change in the entire SVN repo > to point master to, now it'll attempt to find "trunk" to be master. Thanks, I'll build that and try it out. That sounds like what was confusing me.