[darcs-users] recovering changes trashed by conflicting ./addfile

[Taral]

On Mon, Sep 13, 2004 at 09:23:23AM -0400, Craig M. Lennox wrote:
> When confronted with two files created independently but with the same
> name, should Darcs consider them to be two separate files with a name
> clash, or should it consider them to be fundamentally the same file?
> In a distributed environment, the more likely scenario is that two
> people accidentally used the same name for a new file without
> consulting the other.  Given that situation, the easy solution is
> renaming one of the files, but that doesn't resolve the problem as far
> as Darcs is concerned; it carries on wanting to merge both files'
> contents as if they were the same file.  Tragically that approach
> leaves one no way out of the paradox of two independently-arising
> "addfile" patches for the same file.  The result is a merger that
> never goes away.

Uh... last time I checked, mergers never do go away...

-- 
Taral <taral at taral.net>
This message is digitally signed. Please PGP encrypt mail to me.
"Some people cause happiness wherever they go; others, whenever they go."
    -- Oscar Wilde
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-users/attachments/20040913/0d8e3e79/attachment.pgp