Boost logo

Boost-Build :

Subject: Re: [Boost-build] Git directory structure
From: Vladimir Prus (ghost_at_[hidden])
Date: 2013-12-10 10:14:24


On 10.12.2013 18:46, Dave Abrahams wrote:
> Vladimir Prus <ghost_at_[hidden]> writes:
>
>> On 09.12.2013 08:37, Dave Abrahams wrote:
>>> Vladimir Prus <ghost_at_[hidden]> writes:
>>>
>>>> On 09.12.2013 01:51, Dave Abrahams wrote:
>>>>> Vladimir Prus <vladimir_at_[hidden]> writes:
>>>>>
>>>>>> 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?
>>>>>
>>>>> Do _not_ rewrite history, or you will mess up the submodule references
>>>>> in the super-project.
>>>>
>>>> It is trivial to update submodule references.
>>>
>>> ...which would require rewriting history in the super-project, which is
>>> in general not something one should ever do in a public repository.
>>> Since the Boost repositories have gone live, rewriting history is a
>>> no-no. I don't know if there's an option at GitHub to prevent history
>>> rewriting in the official repositories, but if there is, it should be
>>> enabled.
>>
>> Why would you need to rewrite history in super-project? Rewriting history
>> of the 'develop' branch of the 'build' repo does not necessary invalidate
>> any ids that the super-project refers to - it's easy enough to create
>> a new branch, say 'develop-right-after-conversion' that would keep such revisions
>> alive. You will only need to update super-project heads to point to new changeid.
>
> You have a point. However, rewriting public history is still a no-no,
> even in your subproject, for good reasons.

I am afraid I don't like to accept dogmas from above ;-)

Especially, given we're in unique just-after-svn-conversion situation, and especially
given I did not push hard on getting right directory structure created by the conversion
in the interest of getting said conversion done for everybody.

> I can't understand why you'd want to do it in this particular case, either. IMO, just move the files
> and move on.

Because as explained in this thread, this makes it harder to obtain file history, and the whole
goal of conversion was to preserve that.

- Volodya


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