darcs

Issue 1612 `darcs remove' has put Darcs into a confused state

Title `darcs remove' has put Darcs into a confused state
Priority bug Status given-up
Milestone Resolved in
Superseder Nosy List campbell, darcs-devel, dmitry.kurochkin, kowey
Assigned To campbell
Topics ThePendingPatch

Created on 2009-09-14.03:07:32 by campbell, last changed 2017-07-30.23:18:00 by gh.

Messages
msg8807 (view) Author: campbell Date: 2009-09-14.03:07:29
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.
msg8808 (view) Author: kowey Date: 2009-09-14.06:43:00
Hi Taylor,

This looks really interesting!  Do you have a snapshot or go back to a snapshot
of the repository right 'before' the darcs remove?  I just want to see if we can
reproduce this action.

If I revert the changes in your repository and run darcs remove and darcs
record, darcs appears to do the right thing.

(For now, I'm assuming this is pending patch related)
History
Date User Action Args
2009-09-14 03:07:32campbellcreate
2009-09-14 06:43:04koweysetstatus: unknown -> waiting-for
priority: bug
nosy: + kowey
messages: + msg8808
topic: + ThePendingPatch
assignedto: campbell
2017-07-30 23:18:00ghsetstatus: waiting-for -> given-up