git - Getting file to add that was previously on ignore-paths -
we have large svn repository locally use git , git-svn interact with.
recently created repository ignored file starting trunk. fixed ignore-paths ignores directory trunk , not file starting trunk.
now git svn "was not found in commit" error since commits git syncs have file git missing original file commit.
usually 1 use git svn reset -rxxxx , git fetch -rxxxx 2 year old repository , can not roll when file created.
how git pull file down svn?
idea 1:
create svn working copy. then:
svn rm <paths want un-ignore> svn commit -m "ignore workaround" svn merge -r committed:prev . svn commit -m "reverting: ignore workaround"
then edit .git/config
amend ignore-paths
, git svn rebase
.
idea 2:
just copy files manually git repo svn repo, commit them , ditch svn.
idea 3:
don't worry , reset 2 year old git repo.
Comments
Post a Comment