New submission from Drew Perttula <[EMAIL PROTECTED]>:
dash(pts/16):~/projects/ffg-http% darcs wh -s
Yikes, pending has conflicts!
./db/sources.n3 -> ./db/input/sources.n3.full-list-unused
A ./db/input/
R ./db/input/celebs.n3
M ./site.cfg -5 +3
M ./site/ffgpage.py -1 +1
M ./site/statpages.py -1 +1
M ./sparqlhttp/query -1 +2
dash(pts/16):~/projects/ffg-http% darcs pull score:projects/ffg-http -a
Pulling from "score:projects/ffg-http"...
Yikes, pending has conflicts!
darcs failed: Yikes, pending has conflicts!
dash(pts/16):~/projects/ffg-http% darcs revert
Yikes, pending has conflicts!
darcs failed: Yikes, pending has conflicts!
dash(pts/16):~/projects/ffg-http% darcs unpull
Yikes, pending has conflicts!
Sun Feb 18 23:22:03 PST 2007 [EMAIL PROTECTED]
* comment1
Shall I unpull this patch? (1/923) [ynWvpxqadjk], or ? for help: y
Sun Feb 18 23:21:15 PST 2007 [EMAIL PROTECTED]
* comment2
Shall I unpull this patch? (2/923) [ynWvpxqadjk], or ? for help: d
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 [EMAIL PROTECTED]
If possible include the output of 'darcs --exact-version'.
pending_buggy is like this:
{
adddir ./db/input
move ./db/sources.n3 ./db/input/sources.n3.full-list-unused
hunk ./db/input/celebs.n3 1
-#Processed by Id: cwm.py,v 1.190 2006/08/09 23:20:42 syosi Exp
- # using base
...(all lines in file)...
-
-#ENDS
rmfile ./db/input/celebs.n3
}
dash(pts/16):~/projects/ffg-http% darcs --exact-version
darcs compiled on Sep 13 2006, at 06:04:11
# configured Fri Jun 16 14:55:21 EDT 2006
./configure --no-create --no-recursion
Context:
[TAG 1.0.8
Tommy Pettersson <[EMAIL PROTECTED]>**20060616160213]
----------
messages: 1487
nosy: EricKow, beschmi, drewp, droundy, tommy
status: unread
title: pending has conflicts!" report
____________________________________
Darcs issue tracker <[EMAIL PROTECTED]>
<http://bugs.darcs.net/issue414>
____________________________________
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
