I have saved a snapshot of a repository that I was working on, at
<http://mumble.net/~campbell/tmp/scheme-cml.darcs-problem.tgz>(*). In
this repository, I have run `darcs remove mit-critical-suspend.scm
mit-critical-syntax.scm', and now I want to record the change, along
with some related changes in the files README and mit-setup.sh, with
an explicit dependency. But when I run `darcs record --ask-deps
README mit-setup.sh mit-critical-suspend.scm mit-critical-syntax.scm',
it prompts me only for the rmfile hunks, not for the hunks emptying
the two files of their content. If I then push the patch thereby
recorded to another repository, Darcs becomes confused when it tries
to apply an rmfile hunk of a non-empty file.
This happens when I run `darcs remove' and `darcs record' both with
2.0.2 and 2.3.0 + patches (as of a couple of weeks ago).
Fortunately, I can work around this for now by moving the two files to
a temporary location outside the Darcs repository so that Darcs thinks
they have been removed; then Darcs does the right thing and records
hunks emptying the files as well as the rmfile hunks.
(*) I'll leave that tarball up until this bug is closed. If you want
to archive it beyond that, let me know.
|