New submission from Kevin Turner <[EMAIL PROTECTED]>:
Darcs says:
We have conflicts in the following files:
./darcsweb/darcsweb.py
Merging file ./darcsweb/darcsweb.py by hand.
Running command 'emerge3 [...]/version1/./darcsweb/darcsweb.py
[...]/version2/./darcsweb/darcsweb.py [...]/ancestor/./darcsweb/darcsweb.py
[...]/merged/./darcsweb/darcsweb.py'
the problem is, {version1,ancestor}/darcsweb/darcsweb.py does not exist -- that
file is ./darcsweb.cgi in those versions. It was moved in a previous patch in
the repository I'm pulling to.
using darcs 1.0.6 from Debian Etch.
----------
messages: 712
nosy: droundy, keturn, tommy
priority: bug
status: unread
title: trouble external merge tool on moved files
____________________________________
Darcs issue tracker <[EMAIL PROTECTED]>
<http://bugs.darcs.net/issue189>
____________________________________
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
