Re: how do I resolve this merge manually + mergetool bug

[Caleb Cushing <xenoterracide@gmail.com>]

On Tue, Feb 24, 2009 at 2:47 AM, Charles Bailey <charles@hashpling.org> wrote:
> I'll look at adding
> a test case to mergetool and see how easy it is to get it to handle
> this case better.

few weeks back I created a patch for mergetool, it was rejected
ultimately on the basis that it had to cleanup temporary files and in
reality this was a problem with a lot of mergetool, the suggestion was
made that mergetool needs refactoring. I believe this problem is a
similar symptom. basically mergetool should touch my files before I
tell it what to do. if it has to move and back up my files before
deciding then at the very least it should copy them back into place if
I delete the remote. preferably in this case though it would just
delete the remote or backup my local files and copy the remote in
after I told it what to do (or maybe even delete my local files).
-- 
Caleb Cushing

http://xenoterracide.blogspot.com