|
Boost-Build : |
Subject: Re: [Boost-build] Git directory structure
From: Bjørn Roald (bjorn_at_[hidden])
Date: 2013-12-04 00:38:07
On 12/04/2013 05:50 AM, Vladimir Prus wrote:
>
> It seems that after all is said and done, git repository for Boost.Build
> still features that 'v2' directory
> at the top. How do we recover this from this? I suppose I can run make a
> backup copy of current 'master' and 'develop' branches,
> 'git filter-branch' on master and develop with appropriate voodoo, then
> 'git push -f'. Does that seems OK in principle?
I do not think that is OK. But why would you want to do that when a simple
git rm index.html boost.css
git mv v2/* .
rm -rf v2
git commit -a -m "move v2 into root"
and fixing references in bootstrap and elsewhere should do?
You need to decide which of the duplicated index.html and boost.css to
move out of the way or delete. I have not tried to figure which one make
the more sense.
After this you can try
git blame util/string.jam
or other history inspecting tools in git and you will still have history
intact.
-- Bjørn
Boost-Build list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk