Re: [boost] [git] The any library does not pull cleanly because of a forced update on develop and master.

Subject: Re: [boost] [git] The any library does not pull cleanly because of a forced update on develop and master.
From: Vladimir Prus (ghost_at_[hidden])
Date: 2013-12-11 00:28:59

On 11.12.2013 08:54, Vladimir Prus wrote:
> On 11.12.2013 08:42, Ahmed Charles wrote:
>> I don't find either of these aspects of git to be a compelling reason to modify history, which is generally considered to be poor form in
>> any git community and boost should be no different. Making everyone who is using boost through git deal with a non-fast-forward merge is
>> too high a cost for simply getting to avoid typing 8 extra characters
>
> Dealing with non-fast-forward merge at this just-post-conversion point is trivial. There are not many forks, and presumably not many
> people who have non-trivial local changes.
>
> May I ask that this sub-thread don't become yet another where general git advice is given? Rather, if anybody knows specific reason
> why rewriting history of the 'build' module *now* will create problems for *him*, please speak up. Otherwise, I'll evaluate technical
> feasibility (our beloved git might as well take years to run filter-branch), and if it works, will proceed.

Okay, it works. The 'develop-rewritten' branch on github now has rewritten history with content of 'v2' at the top level. It goes accurately
all the way to this:

        Author: Vladimir Prus <ghost_at_[hidden]>  2010-07-14 14:37:12
        Committer: Vladimir Prus <ghost_at_[hidden]>  2010-07-14 14:37:12
        Parent: f23e645d126a1a9038b687f339af62542b33a48e (Use toolset.requirements in targets.py)
        Child:  89479d87f20fd0f9f181f2bf1251f26a6665d405 (Stop 'import toolset in Jamfiles from reloading b2.build.tooset.)
        Branches: develop-rewritten, remotes/origin/develop-rewritten
        Follows:
        Precedes:

            Move tools/jam into tools/build/v2/engine

        [SVN r64010]

Prior to that, history does not have sources of what was known as bjam - which does not seem like a problem for day
to day development. In return, we have a proper history of Boost.Build V2 since the beginning of time.

- Volodya