New submission from Jason Purdy <[EMAIL PROTECTED]>:
I have conflicting pending patches. 'darcs repair' and 'darcs check'
don't report anything wrong, though.
Do you want to add a long comment? [yn]y
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'.
$ darcs --exact-version
darcs compiled on Nov 20 2006, at 14:33:22
# configured Mon Oct 9 15:12:44 EDT 2006
./configure --no-create --no-recursion
Context:
[TAG 1.0.9rc1
Tommy Pettersson <[EMAIL PROTECTED]>**20061008175207]
----------
files: pending_buggy
messages: 2013
nosy: beschmi, droundy, jason, kowey, tommy
status: unread
title: pending has conflicts
__________________________________
Darcs bug tracker <[EMAIL PROTECTED]>
<http://bugs.darcs.net/issue510>
__________________________________
{
move ./tmpls/locations.TMPL ./templates/locations.TMPL
rmfile ./graphics/TOC/0504/cover-small.jpg
rmfile ./graphics/TOC/0504/cover-store.jpg
rmfile ./graphics/TOC/0504/cover28.jpg
rmdir ./graphics/TOC/0504
rmfile ./graphics/homepage/frankenstein.jpg
rmfile ./graphics/reviews/adaptations.jpg
rmfile ./issue/0504/adindex28.phtml
rmfile ./issue/0504/afi_100.phtml
rmfile ./issue/0504/comments.phtml
rmfile ./issue/0504/graphics/gone.jpg
rmdir ./issue/0504/graphics
rmfile ./issue/0504/index.phtml
rmdir ./issue/0504
hunk ./tmpls/locations.TMPL 1
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN">
-<html lang="en">
-<head>
- <title>Retail Store Locator for Fine Books and Collections</title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <link href="/calendar/main.css" rel="stylesheet" type="text/css" />
-<style type="text/css">
-<!--
-#location_content {
- padding: 1em;
-}
-#location_table td {
-padding-top: 4px;
-padding-bottom: 4px;
-}
-.sortby {
- font-size: 9px;
- font-family: Arial, Helvetica, sans-serif;
- color: #333333;
- text-transform: uppercase;
- text-decoration: none;
- border-bottom-width: 1px;
- border-bottom-style: solid;
- border-bottom-color: #cccccc;
-}
-.event {
- font-family: "Times New Roman", Times, serif;
- font-size: 13px;
- padding-top: 3px;
- padding-right: 15px;
- padding-bottom: 15px;
-}
-.section-head {
- font-family: "Times New Roman", Times, serif;
- font-size: 22px;
- line-height: 1.1em;
- margin-bottom: 15px;
-}
-.category {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-weight: bold;
- color: #000;
- margin-bottom: 3px;
- border-bottom-width: 1px;
- border-bottom-style: solid;
- border-bottom-color: #cccccc;
-}
-.category a {
- text-decoration: none;
- color: #000;
-}
-.category a:hover {
- text-decoration: underline;
- color: #000;
-}
-.website {
- font-family: Arial, Helvetica, sans-serif;
- font-size: 14px;
- margin-top:3px;
-}
-.odd {
- font-family: "Times New Roman", Times, serif;
- font-size: 13px;
- background-color: #E3E2B5;
-}
--->
-</style>
-<script src="http://www.google-analytics.com/urchin.js"; type="text/javascript">
-</script>
-<script type="text/javascript">
-_uacct = "UA-99356-1";
-urchinTracker();
-</script>
-</head>
-<BODY bgcolor="#FFFFFF" text="#000000" link="#000000" vlink="#000000"
alink="#000000" >
-<div id="top">
-<!-- TMPL_INCLUDE NAME="/var/www/fbm/web/includes/fbc-top.html" -->
-</div>
-<div id="location_content">
- <div class="section-head">Retail Store Locator</div>
- <div class="text">
- Fine Books & Collections magazine is now available in select
bookstores and locations nationwide. To find a retailer near you simply enter
the city and state (or just state) you wish to search.
- </div>
- <form method="post" action="" name="search">
- <table id="location_table" width="100%" border="0" cellspacing="0"
cellpadding="0" >
- <!-- TMPL_IF NAME="results" -->
- <tr>
- <td colspan="3" class="event"><!-- TMPL_VAR
NAME="results"></td>
- </tr>
- <tr>
- <!-- TMPL_LOOP NAME="sort_array" -->
- <td align="left">
- <a href="/locations?rm=search¤t_page=<!--
TMPL_VAR NAME="page" -->&sort=<!-- TMPL_VAR NAME="sort_link" -->&state=<!--
TMPL_VAR NAME="state" -->&city=<!-- TMPL_VAR NAME="city" -->"><font
class="category"><!-- TMPL_VAR NAME="name" --></font><img border="no"
src="graphics/<!-- TMPL_VAR NAME="sort_image" -->">
- </td>
- <!-- /TMPL_LOOP -->
- </tr>
- <!-- TMPL_LOOP NAME="locations" -->
- <tr <!-- TMPL_IF NAME="__ODD__" -->class="odd"<!-- /TMPL_IF -->>
- <td align="left">
- <font class="event"><!-- TMPL_VAR NAME="name" --></font>
- </td>
- <td><font class="event"><!-- TMPL_VAR NAME="address"
--></font></td>
- <td><font class="event"><!-- TMPL_VAR NAME="city"
--></font></td>
- <td><font class="event"><!-- TMPL_VAR NAME="state"
--></font></td>
- <td><font class="event"><!-- TMPL_VAR NAME="zip"
--></font></td>
- <td><font class="event"><!-- TMPL_VAR NAME="country"
--></font></td>
- </tr>
- <!-- /TMPL_LOOP -->
- <tr>
- <td class="website">
- <input type="hidden" name="current_page" value="<!-- TMPL_VAR
NAME="current_page" -->">
- <!-- TMPL_LOOP NAME="pages" -->
- <!-- TMPL_IF NAME="current" -->
- <u><!--TMPL_VAR NAME="page"--></u>
- <!-- TMPL_ELSE -->
- <a href="/locations?rm=search¤t_page=<!--TMPL_VAR
NAME="page"-->&sort=<!-- TMPL_VAR NAME="sortby" -->&state=<!--TMPL_VAR
NAME="state"-->&city=<!-- TMPL_VAR NAME="city" -->"><!--TMPL_VAR
NAME="page"--></a>
- <!-- /TMPL_IF -->
- <!-- /TMPL_LOOP -->
- </td>
- </tr>
- <tr valign="top"><td colspan="6"><hr></td></tr>
- <!-- /TMPL_IF -->
- <tr>
- <td>
- <div class="event"> Enter a City Name: <input type="text"
name="city" value="<!-- TMPL_VAR NAME="city" -->"></input></div>
- <div class="event"> OR </div>
- <div class="event">Select a
State:
- <select name="state" size="1">
- <!-- TMPL_IF NAME="state"-->
- <option value="<!-- TMPL_VAR NAME="state" -->"
selected><!-- TMPL_VAR NAME="state" --></option>
- <!-- TMPL_ELSE -->
- <option value="" selected>Choose One</option>
- <!-- /TMPL_IF -->
- <option value="AL">Alabama</option>
- <option value="AK">Alaska</option>
- <option value="AZ">Arizona</option>
- <option value="AR">Arkansas</option>
- <option value="CA">California</option>
- <option value="CO">Colorado</option>
- <option value="CT">Connecticut</option>
- <option value="DE">Delaware</option>
- <option value="DC">District of Columbia</option>
- <option value="FL">Florida</option>
- <option value="GA">Georgia</option>
- <option value="HI">Hawaii</option>
- <option value="ID">Idaho</option>
- <option value="IL">Illinois</option>
- <option value="IN">Indiana</option>
- <option value="IA">Iowa</option>
- <option value="KS">Kansas</option>
- <option value="KY">Kentucky</option>
- <option value="LA">Louisiana</option>
- <option value="ME">Maine</option>
- <option value="MD">Maryland</option>
- <option value="MA">Massachusetts</option>
- <option value="MI">Michigan</option>
- <option value="MN">Minnesota</option>
- <option value="MS">Mississippi</option>
- <option value="MO">Missouri</option>
- <option value="MT">Montana</option>
- <option value="NE">Nebraska</option>
- <option value="NV">Nevada</option>
- <option value="NH">New Hampshire</option>
- <option value="NJ">New Jersey</option>
- <option value="NM">New Mexico</option>
- <option value="NY">New York</option>
- <option value="NC">North Carolina</option>
- <option value="ND">North Dakota</option>
- <option value="OH">Ohio</option>
- <option value="OK">Oklahoma</option>
- <option value="OR">Oregon</option>
- <option value="PA">Pennsylvania</option>
- <option value="RI">Rhode Island</option>
- <option value="SC">South Carolina</option>
- <option value="SD">South Dakota</option>
- <option value="TN">Tennessee</option>
- <option value="TX">Texas</option>
- <option value="UT">Utah</option>
- <option value="VT">Vermont</option>
- <option value="VA">Virginia</option>
- <option value="WA">Washington</option>
- <option value="WV">West Virginia</option>
- <option value="WI">Wisconsin</option>
- <option value="WY">Wyoming</option>
- <option value="NA">N/A (outside the US) </option>
- </select>
- </div>
- <div>
- <input type="hidden" name="rm" value="search">
- <input type="submit" value="Search">
- </div>
- </td>
- </tr>
- </table>
- </form>
-</div>
-</body>
-</html>
rmfile ./tmpls/locations.TMPL
}
_______________________________________________
darcs-devel mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-devel
