Re: [MirageOS-devel] Merging in Irmin

[Thomas Gazagnaire <thomas@xxxxxxxxxxxxxx>]

> When merged, the result needs to include the parent, even though it
> was deleted in one branch and not touched in the other. Can I do this?

Do you mean you want to control which are the parents of a commit you are 
creating, even if the respective contents are not related?

You can manually create a commit by using Irmin.Private.Commit.create[1] and 
save it in the (private) block store with S.Private.Commit.add[2]

Not sure how to expose that nicely to the user though... maybe allowing to 
specify a "parent" optional argument to merge/update/rebase.

Thomas

[1] http://mirage.github.io/irmin/Irmin.Private.Commit.S.html#VALcreate
[2] http://mirage.github.io/irmin/Irmin.Private.S.html




> 
> 
> -- 
> Dr Thomas Leonard        http://0install.net/
> GPG: 9242 9807 C985 3C07 44A6  8B9A AE07 8280 59A5 3CC1
> GPG: DA98 25AE CAD0 8975 7CDA  BD8E 0713 3F96 CA74 D8BA
> 
> _______________________________________________
> MirageOS-devel mailing list
> MirageOS-devel@xxxxxxxxxxxxxxxxxxxx
> http://lists.xenproject.org/cgi-bin/mailman/listinfo/mirageos-devel


_______________________________________________
MirageOS-devel mailing list
MirageOS-devel@xxxxxxxxxxxxxxxxxxxx
http://lists.xenproject.org/cgi-bin/mailman/listinfo/mirageos-devel