[PATCH 2 of 5 v3] rebase: return merge parents from defineparents which becomes computerebase

Pierre-Yves David pierre-yves.david at ens-lyon.org
Thu Dec 4 18:11:02 CST 2014



On 12/03/2014 07:12 PM, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1417052361 -3600
> #      Thu Nov 27 02:39:21 2014 +0100
> # Node ID 5a39fd5c40c861a0da05cbbc2f80fbedcda19835
> # Parent  a20a470ffce95d5266b8e332c0e01c72604fc528
> rebase: return merge parents from defineparents which becomes computerebase
>
> So far the merge parents are trivial. Soon, we want to compute it more
> carefully and correctly.

Again, unsure about what you are trying to achieve here. Can you be more 
specific?

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list