[darcs-devel] [issue1219] External merge with deletion

[Trent Buck]

New submission from Trent Buck <trentbuck at gmail.com>:

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.

----------
messages: 6647
nosy: dagit, dmitry.kurochkin, kowey, simon, thorkilnaur, twb
status: unread
title: External merge with deletion

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue1219>
__________________________________