[darcs-users] Fwd: Towards a conflict-free revision control system.

[Jean-Philippe Bernardy]

On Fri, Jan 16, 2009 at 6:54 PM, Kari Hoijarvi <hoijarvi at seas.wustl.edu> wrote:

> Darcs 1 conflicts with identical changes , darcs 2 does not. I think darcs 2
> does the intuitive good thing, but I haven't thought what are the
> consequences when you unrecord such patches, I haven't used darcs2 enough to
> run to such situation.  Time will tell, I use unrecord a lot when
> prototyping.

I'm a bit surprised that darcs 2 decided to support confluence, given how
that is controversial and poorly matches the operation-based model.

Can we have implementer's view on what's going to happen with unrecord?


Cheers,
JP.