darcs

Issue 723 leftover lock files or else "Apply failed!" bug

Title leftover lock files or else "Apply failed!" bug
Priority bug Status resolved
Milestone Resolved in
Superseder Nosy List darcs-devel, dmitry.kurochkin, kowey, thorkilnaur, tommy, zooko
Assigned To
Topics

Created on 2008-03-03.14:19:06 by zooko, last changed 2009-08-27.14:09:22 by admin.

Messages
msg3717 (view) Author: zooko Date: 2008-03-03.14:19:04
The following process always leaves a stale lock file:

1. darcs record in repo A, leave it in the state of editing the patch  
description
2. darcs push from another computer to repo A, leave it in the staet  
of "waiting for lock"
3. finish the patch description in repo A

Now the push proceeds, but in this case I get "Apply failed!" (is  
that the way that darcs-2 reports conflicts?).

Now there is a leftover lock file in repo A.

So actually maybe there is a bug here and darcs-2 is not intended to  
write "Apply failed!" and leave a lock file behind...

Regards,

Zooko
msg3725 (view) Author: droundy Date: 2008-03-03.16:28:34
Thanks, for the bug report, but alas, I've been unable to reproduce this! When I
do this, I get:

Backing up ./build.xml(-darcs-backup0)
There are conflicts in the following files:
./build.xml

darcs failed:  Refusing to apply patches leading to conflicts.
If you would rather apply the patch and mark the conflicts,
use the --mark-conflicts or --allow-conflicts options to apply
These can set as defaults by adding
 apply mark-conflicts
to _darcs/prefs/defaults in the target repo.
Apply failed!

And there's no lock in either repository afterwards.  Perhaps this is a bug that
has already been fixed in the most recent darcs-unstable?

David
History
Date User Action Args
2008-03-03 14:19:06zookocreate
2008-03-03 16:28:35droundysetpriority: bug
status: unread -> resolved-in-unstable
messages: + msg3725
nosy: droundy, tommy, beschmi, kowey, zooko
2008-09-04 21:32:53adminsetstatus: resolved-in-unstable -> resolved
nosy: + dagit
2009-08-06 17:55:26adminsetnosy: + markstos, jast, Serware, dmitry.kurochkin, darcs-devel, mornfall, simon, thorkilnaur, - droundy
2009-08-06 20:59:31adminsetnosy: - beschmi
2009-08-10 22:16:52adminsetnosy: - markstos, darcs-devel, jast, Serware, mornfall
2009-08-11 00:08:09adminsetnosy: - dagit
2009-08-25 18:06:52adminsetnosy: + darcs-devel, - simon
2009-08-27 14:09:22adminsetnosy: tommy, kowey, darcs-devel, zooko, thorkilnaur, dmitry.kurochkin