darcs

Issue 251 Yikes, pending has conflicts! (1.0.7pre1)

Title Yikes, pending has conflicts! (1.0.7pre1)
Priority bug Status resolved
Milestone Resolved in
Superseder Yikes, pending has conflicts! (1.0.8)
View: 414
Nosy List catap, darcs-devel, dmitry.kurochkin, jch, kannon_bosatsu, kowey, markstos, thorkilnaur, tommy
Assigned To
Topics

Created on 2006-08-25.18:35:29 by kannon_bosatsu, last changed 2009-08-27.14:05:01 by admin.

Files
File name Uploaded Type Edit Remove
pending_buggy kannon_bosatsu, 2006-08-25.18:35:28 application/octet-stream
Messages
msg937 (view) Author: kannon_bosatsu Date: 2006-08-25.18:35:28
What follows is a copy-paste from my [Windows 2000 Pro SP4] command prompt. 
Attached is the pending_buggy file, as requested by darcs.exe.

Feel free to get in touch for more information.

Adam J Richardson

//////////////////////////////////////////////////////////////////////////////////////////

15:25:16.09> darcs remove blob.cc

darcs failed:  Can't remove blob.cc

15:26:43.86> darcs remove Blob.cc

darcs failed:  Can't remove Blob.cc

15:26:47.80> darcs remove Blob.cc

darcs failed:  Can't remove Blob.cc

15:27:12.61> darcs remove engine/Blob.cc

15:27:29.73> darcs whatsnew
Yikes, pending has conflicts!
{
rmfile ./engine/Blob.cc
}

15:29:55.65> darcs add *.txt
Yikes, pending has conflicts!
darcs: bug in darcs!
There was an attempt to write an invalid pending!
If possible, please send the contents of _darcs/patches/pending_buggy
along with a bug report.
Please report this to bugs@darcs.net
If possible include the output of 'darcs --exact-version'.

15:30:37.10> darcs --exact-version
darcs compiled on Feb 28 2006, at 22:08:07
# configured Tue Feb 28 21:55:13 USMST 2006
./configure --disable-mmap

Context:

[bump version to 1.0.7pre1
Tommy Pettersson <ptp@lysator.liu.se>**20060301000323]

[show 1.0.6 as latest stable source on web page
Tommy Pettersson <ptp@lysator.liu.se>**20060301000158
Forgot this, again :-/
]

[TAG 1.0.6
Tommy Pettersson <ptp@lysator.liu.se>**20060228111841]

15:30:56.90>

//////////////////////////////////////////////////////////////////////////////////////////

_________________________________________________________________
Windows Live™ Messenger has arrived. Click here to download it for free! 
http://imagine-msn.com/messenger/launch80/?locale=en-gb
Attachments
msg946 (view) Author: jch Date: 2006-08-31.23:31:01
For what it's worth, pending_buggy consists of
 
  rmfile ./engine/Blob.cc
  addfile ./settings.txt
  addfile ./strings.txt

which is, to say the least, curious.
msg1341 (view) Author: droundy Date: 2006-12-17.22:26:12
I'm afraid this bug has me at a loss.  It seems like there must have been some
sort of preexisting condition in your repository.  Can you reproduce this? And
if so, could we take a look at the repository? Thanks!

David
msg1444 (view) Author: catap Date: 2007-01-30.10:16:32
Repeat this bug:

kirill@kirill:/tmp$ mkdir darcs-issue-251
kirill@kirill:/tmp$ cd darcs-issue-251/
kirill@kirill:/tmp/darcs-issue-251$ mkdir dirfordel
kirill@kirill:/tmp/darcs-issue-251$ cd dirfordel
kirill@kirill:/tmp/darcs-issue-251/dirfordel$ touch 1 2 3 4
kirill@kirill:/tmp/darcs-issue-251/dirfordel$ cd ../
kirill@kirill:/tmp/darcs-issue-251$ darcs initializ
kirill@kirill:/tmp/darcs-issue-251$ darcs add -r dirfordel
kirill@kirill:/tmp/darcs-issue-251$ darcs remove dirfordel

darcs failed:  Can't remove dirfordel
kirill@kirill:/tmp/darcs-issue-251$
msg3486 (view) Author: markstos Date: 2008-02-16.03:48:40
I believe this bug is resolved-in-unstable, because it a dupe of issue414, which
is resolved-in-unstable. 

"catap"'s later test script which ends this way is a different issue:

 darcs failed:  Can't remove dirfordel

That behavior is still exists, but is not a real bug, but is a place where we
could provide better feedback. The error message should report the reason that
this directory can't be removed: Because it has files in it which have been
added and not removed. (My wish to have "remove -r" is related).
History
Date User Action Args
2006-08-25 18:35:29kannon_bosatsucreate
2006-08-31 23:31:08jchsetstatus: unread -> unknown
nosy: + jch
messages: + msg946
2006-12-17 22:26:13droundysetnosy: + kowey
messages: + msg1341
2006-12-17 23:12:06droundysetstatus: unknown -> deferred
nosy: droundy, jch, tommy, kowey, kannon_bosatsu
2007-01-30 10:16:38catapsetnosy: + beschmi, catap
messages: + msg1444
2007-07-25 07:48:59koweysetnosy: droundy, jch, tommy, beschmi, kowey, kannon_bosatsu, catap
title: DARCS Bug Report - "pending has conflicts" -> pending has conflicts
2007-07-25 08:00:21koweysettitle: pending has conflicts -> Yikes, pending has conflicts! (1.0.7pre1)
2007-08-03 17:22:07droundysetstatus: deferred -> duplicate
2008-02-16 03:48:42markstossetstatus: duplicate -> resolved-in-unstable
nosy: + markstos
superseder: + Yikes, pending has conflicts! (1.0.8)
messages: + msg3486
2008-09-04 21:29:06adminsetstatus: resolved-in-unstable -> resolved
nosy: + dagit
2009-08-06 17:34:03adminsetnosy: + jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, simon, thorkilnaur, - droundy, jch, kannon_bosatsu, catap
2009-08-06 20:31:24adminsetnosy: - beschmi
2009-08-10 21:54:56adminsetnosy: + jch, kannon_bosatsu, catap, - darcs-devel, zooko, jast, Serware, mornfall
2009-08-10 23:55:50adminsetnosy: - dagit
2009-08-25 17:48:44adminsetnosy: + darcs-devel, - simon
2009-08-27 14:05:01adminsetnosy: jch, tommy, kowey, markstos, darcs-devel, kannon_bosatsu, catap, thorkilnaur, dmitry.kurochkin