Apparently I cannot leave a comment on that issue (there is no option
on the site to create an account and without one I see no option to
reply to the issue), so I'll post it here.
I can confirm that bug report. I happens to me every time I pull and
there is a conflict. I have the following setting in ~/.darcs/defaults:
ALL external-merge kdiff3 --output %o %a %1 %2
The case where I see this is if I have unrecorded changes to the
working directory and I pull a patch with conflicts with my unrecorded
changes. In that case the external merge application is invoked. In it
I can see the ancestor version and the pulled version all right, but
my own version is completely empty. darcs generates 3 directory trees
in /tmp: /tmp/ancestor, /tmp/version1 and /tmp/version2. The ancestor
and version2 trees and files are all right. But the version1 tree is
broken. It contains the correct directory structure and the required
files, as the other 2 trees do, but all the files under the version1
tree are empty.
--
Dan
_______________________________________________
darcs-users mailing list
darcs-users@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-users
