[darcs-devel] [issue542] darcs bug report

[Jason Purdy]

New submission from Jason Purdy <jason at journalistic.com>:

Tue Oct  2 13:54:00 EDT 2007  jason at journalistic.com
   * daily_07OCT02
    * various changes
Shall I pull this patch? (1/1) [ynWvxqadjk], or ? for help: y
We have conflicts in the following files:
./advisoryboard/index.phtml ./includes/left.html ./index.phtml 
./sponsors/index.phtml ./sponsors/sponsor_inq.phtml 
./sponsors/thankyou.phtml

Fail: bug in darcs!
There was an attempt to write an invalid pending!
If possible, please send the contents of _darcs/pending_buggy along
with a bug report.
Please report this to bugs at darcs.net
If possible include the output of 'darcs --exact-version'.
$ darcs --exact-version
darcs compiled on Feb 12 2005, at 13:59:36
# configured Sat Feb 12 13:53:58 PST 2005
sh ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib 
--mandir=/usr/share/man

Context:

[ removed obsolete NEWS files
Isaac Jones <ijones at syntaxpolice.org>**20050212211000]

[syncinc with my debian repo after 1.0.0 bug
Isaac Jones <ijones at syntaxpolice.org>**20050212205746]

[TAG 1.0.2
David Roundy <droundy at abridgegame.org>**20050204123805]

----------
files: pending_buggy
messages: 2148
nosy: beschmi, droundy, jason, kowey, tommy
status: unread
title: darcs bug report

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue542>
__________________________________
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: pending_buggy
Url: http://lists.osuosl.org/pipermail/darcs-devel/attachments/20071002/072a93cd/attachment-0001.diff