[Omake] SVN Commit: OMake Build System (Rev. 10153)

[Aleksey Nogin]

On 04.03.2007 08:28, Jason Hickey wrote:

> Module name: OMake Build System
> Changes by: jyh at cs.caltech.edu (Jason Hickey)
> Date: 2007-03-04 08:28:53 -0800 (Sun, 04 Mar 2007)
> Revision: 10153
> Log message:
>       I'd like to be able to use GIT for a little while, in the hope that I
>       get better branching and merging (to be seen).

GIT, not darcs? As far as I understand, GIT is a fairly narrow hack that
Linus have created specifically for the purpose of maintaining the
kernel sources and it is relatively feature-limited.

Here is the important quote from
http://changelog.complete.org/posts/528-Whose-Distributed-VCS-Is-The-Most-Distributed.html
:

> 4. Inividial changesets should be mergeable without bringing across the whole history
> 
> Darcs is really the only one that can do this right. I was really surprised that nobody else could, since it is such a useful and vital feature for me.
> 
> Both bzr and git have a cherry-pick mode that simulates this, but really these commands just get a diff from the specific changeset requested, then apply the diff as with patch. So you really get a different changeset committed, which can really complicate your history later -- AND lead to potential conflicts in future merges.


>       For this, I need to the branches directory to have the normal form:
>       every directory in omake-branches is a branch.  I apologize for
>       this renaming, but it seems easier than hacking git-svn for our
>       special case.

Yak! Could we have survived with renaming omake-branches/closed into
omake-closed-branches ?

Aleksey