Re: git-svn: Having a "rare" structure
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Nov 5, 2008, 17:41 UTC
- Message-ID
- <4911DADA.4010902@drmicha.warpmail.net>
- In-Reply-To
- <2686a05b0811050736q520f1771t6ffa2840bfb3c308@mail.gmail.com>
Marc Fargas venit, vidit, dixit 05.11.2008 16:36:
Show 18 quoted lines
> Hi, > > On Wed, Nov 5, 2008 at 2:07 PM, Michael J Gruber > <git@drmicha.warpmail.net> wrote: >> git config svn-remote.svn.branches >> 'django/branches/features/*:refs/remotes/svn/features/*' >> >> git config --add svn-remote.svn.branches >> 'django/branches/releases/*:refs/remotes/svn/releases/*' >> >> In fact, you should be able to use your previous branches config when >> fetching up to r9093, then switch to the config I suggested, and the >> fetch from r9094. > > I'll try it right now, I have one q... I've been fetching from svn so > I now have "like a mess" in the branches dir (and their history) is > there a way to make git-svn forget about everything after r9093 so I > can do the config change and re-fetch since then? That'd be awesome.
You can delete the bogus branches (using git branch -rd or git update-ref -d), but I'm not sure if you can reset git svn's state info: You may try messing with .git/svn/.metadata.
I tried the approach I suggested in the last post for real, and things seem to work. Only gotcha is I don't know whether django folks will stick with putting branches under {releases,features}, that would create problems.
Cheers, Michael