Re: hgmq vs. StGIT

On 01/11/05, Chris Mason [off-list ref] wrote:

The three way merge is still possible even if someone hand edits the
patch.  For a three way merge, you just need to know the parent revision
of the change you want to merge.  parent can mean the revision in the
repository that precedes this patch (mq stores this information, just
not in the patch), or it can mean any revision where the patch applies
cleanly.

Yes, but what I meant is that someone may modify the patch in a way
that it is no longer appliable to its parent or to any other revision
in the tree. A this point, a three-way merge is no longer possible
(but, well, if someone modifies the patches this way should be able to
cope with the consequences).

Both approaches (mq vs stgit) have advantages...you can get roughly the same
functionality either way.

Yes, you are right. The big difference is the underlying tool (hg or git).

--
Catalin