Hi all,
I've been a happy git-svn user for about 9 months but today I got into
a big mess. My company's svn repo is a terribly ugly cesspool of
projects, so I made a directory where I was going to keep branches of
my project:
/branches/myProject/branchX
/branches/myProject/branchX-new
In my .git/config I've got:
[svn-remote "svn"]
url = https://...
fetch = trunk/myProject:refs/remotes/trunk
branches = branches/myProject/*:refs/remotes/branches/*
Now three ugly things happened today. Somebody mistakenly copied a
branch of our server code into the myProject directory.
/branches/myProject/branchX
/branches/myProject/branchX-new
/branches/myProject/server-branch
It turns out that "myProject" wasn't specific enough, so we decided to
rename the folders:
/branches/myProject-client/branchX
/branches/myProject-client/branchX-new
/branches/myProject-server/server-branch
And while I was on a roll I decided to do something really stupid and
further rename my project's branches:
/branches/myProject-client/branchX-failed
/branches/myProject-client/branchX
/branches/myProject-server/server-branch
This was all done in svn, and when I went back to git I realized I had
no idea how to fix things up in git-svn. After much misery I finally
decided to start fresh with a new git-svn checkout. But now when I
'git svn fetch' it starts pulling down the full, enormously long
history of server-branch. I've tried various permutations of ignore-
paths in the config file but I just can't get it to ignore that path.
(Perhaps it won't ignore a path at the top level of a branches
folder?)
Can anyone help me untangle this mess and get a checkout without the
full history of server-branch?
Thanks,
-Nathan
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/git-users?hl=en.
