Just now I pulled in a recent unstable patch, which deleted the
Franchise Setup.hs file.  In the repo was already a draft patch that
*MOVED* it to release/.

Merging file ./Setup.hs by hand.
Running command 'twb-meld-darcs /tmp/merged/./Setup.hs /tmp/ancestor/./release/Setup-franchise.hs /tmp/version1/./release/Setup-franchise.hs /tmp/version2/./release/Setup-franchise.hs'

This didn't do what I want, because the ancestor/ and version2/ files
did not exist.

Attached is a test case that demonstrates the problem.

It seems that the output of ls is being hidden by Darcs.  By changing
"ls" to "xterm -hold -e ls", you can see the output, which is:

    ls: cannot access /tmp/ancestor/./y: No such file or directory
    ls: cannot access /tmp/version2/./y: No such file or directory
    -rw-r--r-- 1 twb twb 4 2008-11-14 11:47 /tmp/version1/./y

Attachments

• tmp.sh
• typescript

What would be the ideal behaviour here?

On Sun, Dec 21, 2008 at 05:24:44PM -0000, Eric Kow wrote:
> What would be the ideal behaviour here?

If I rightly remember which bug we're talking about, the problem is
that external merge was called on

    %1/bar %2/bar %a/bar %o/bar

But in %1 and %a, foo has not been renamed to bar.  So it should be
calling

    %1/foo %2/bar %a/foo %o/bar

On Thu, Nov 13, 2008 at 01:48:35PM +0000, trentbuck@gmail.com wrote:
> Attached is a test case that demonstrates the problem.
> 
> It seems that the output of ls is being hidden by Darcs.  By changing
> "ls" to "xterm -hold -e ls", you can see the output, which is:
> 
>     ls: cannot access /tmp/ancestor/./y: No such file or directory
>     ls: cannot access /tmp/version2/./y: No such file or directory
>     -rw-r--r-- 1 twb twb 4 2008-11-14 11:47 /tmp/version1/./y

Sorry, I think this message was for a different bug, but I don't know
which one yet.

Unless I'm mistaken, this is another instance of issue189.  It might not be if 
the *deletion* was important and not the renaming here.