In my job, the official SVN repo was moved from one machine to another.
I do all my work on my git repo and, of course, I work on several things in
parallel, keeping a lot of local branches.
Now a need to hack my git repo to track the SVN repo at its new location.
I don't want to reclone the SVN repo because it would mean to move all my
local branches one by one.
The old machine's name is 'pipeline'. The new one is 'condor'.
I did the following:
$ git gc
Counting objects: 1898, done.
Compressing objects: 100% (1266/1266), done.
Writing objects: 100% (1898/1898), done.
Total 1898 (delta 1117), reused 1070 (delta 571)
$ git status
# On branch master
nothing to commit (working directory clean)
$ git filter-branch --msg-filter 'sed "s$git-svn-id: svn+ssh://pipeline$git-svn-id: svn+ssh://condor$g' $(cat .git/packed-refs | awk '// {print $2}' | grep -v 'pack-refs')
Cannot rewrite branch(es) with a dirty working directory.
Uh? Status finds my working directory clean, but filter-branch seems to
disagree.
Thanks in advance.
--
Felipe Sánchez
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html