Re: hot to fix git svn import or just discard 'branches' folder
- From
- Marius Seritan <mseritan@decodeideas.com>
- Date
- Feb 4, 2009, 19:24 UTC
- Message-ID
- <06C1D783-D51B-49E9-92A2-C1EA035BE3D6@decodeideas.com>
- In-Reply-To
- <5713EFD1-E6E7-4FD5-BF17-FDA5FF6F7C6B@decodeideas.com>
On Feb 4, 2009, at 11:05 AM, Marius Seritan wrote:
Show 7 quoted lines
>> >> I believe fixing this without reimporting requires using "git >> filter-branch". I'm unfamiliar with it, so I can't help you with >> that part. > > Thanks, I will look into it. From the first read this seems to be > pretty advanced.
Ok, I think I killed it :-/
I did git filter-branch --subdirectory-filter trunk -- --all
This cleaned up git and I have just the trunk for 218MB, that's much more acceptable. Unfortunately 'git svn rebase' now returns:
Unable to determine upstream SVN information from working tree history
I went into the .git/config and added a trunk but no luck. I also edited .git/svn/.metadata in the same way.
As another data point git svn log is still working.
Marius