[darcs-devel] darcs patch: remove commute_nameconflict (rarely invoked and ugly)

[David Roundy]

This one is a potentially dangerous cleanup.  I believe it's
unambiguously an improvement, and doubt it'll cause any trouble,
but am unsure, thus this note.

We used to have a special treatment for conflicts in which one
patch creates a file while another patch renames a file to have
the same name.  It's a rare case, and I think we probably want
to just fix it right now as a cleanup.  The resulting code violates
a number of the commute rules that we patch theorists now take for
granted, so I think it's best to just remove it.  An option to
alleviate the danger would be to write a function in darcs check that
checks if any such "nameconflict" patches exist.

I'm not sure of another option.  I've not seen one of these beasts
generated in a merge... perhaps ever, outside of unit testing?

David

Mon Aug  6 15:11:56 PDT 2007  David Roundy <droundy at darcs.net>
  * remove commute_nameconflict (rarely invoked and ugly)
  Note: this might be able to cause trouble with existing repositories.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: text/x-darcs-patch
Size: 73617 bytes
Desc: A darcs patch for your repository!
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20070807/7b618f3d/attachment-0001.bin