[darcs-devel] darcs patch: fix commutation of addition and move
patches.
David Roundy
droundy at darcs.net
Wed Aug 8 01:05:07 UTC 2007
This is another one of those semantics-altering changes, like the
commute_nameconflict patch I just sent. In this case, I'm changing
it so that a file rename patch depends on the addition of that file.
It's what folks expect intuitively, and it's what the latest patch
theory requires. Previously, we allowed the patch to commute with
the file addition (so you could rename a file before adding it), but
not with file removal. It's much better to just keep things consistent,
in my opinion.
Again, this is something that very rarely has any effect in "real life"
repositories, if ever. So I vote for making this change.
David
Tue Aug 7 17:50:21 PDT 2007 David Roundy <droundy at darcs.net>
* fix commutation of addition and move patches.
This is potentially dangerous, but something we'll have to
do in the long run (the new conflicts stuff assumes a property
this patch restores). We used to allow move patches to commute
with add patches in one direction, so as to reduce the number
of conflicts. This violated the rule that if A commutes with B,
then it will also commute with (invert B).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: text/x-darcs-patch
Size: 69788 bytes
Desc: A darcs patch for your repository!
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20070807/beb6a12b/attachment-0001.bin
More information about the darcs-devel
mailing list