Created on 2007-02-19.15:02:45 by drewp, last changed 2009-08-27.14:06:16 by admin.
| msg1487 (view) |
Author: drewp |
Date: 2007-02-19.15:02:30 |
|
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 drewp@bigasterisk.com
* comment1
Shall I unpull this patch? (1/923) [ynWvpxqadjk], or ? for help: y
Sun Feb 18 23:21:15 PST 2007 drewp@bigasterisk.com
* 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 bugs@darcs.net
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 <ptp@lysator.liu.se>**20060616160213]
|
| msg1504 (view) |
Author: kowey |
Date: 2007-03-06.07:58:37 |
|
I assume the conflict in question is:
A ./db/input/
R ./db/input/celebs.n3
Trying to remove a file from a directory we're only just adding?
|
| msg2587 (view) |
Author: markstos |
Date: 2008-01-19.06:22:48 |
|
We'll need a reproducible test case to look into this further. Marking as "need
example" for now.
|
| msg2596 (view) |
Author: droundy |
Date: 2008-01-19.13:03:59 |
|
I'm resolving this bug, as we have fixed many buggy-pending bugs since darcs
1.0.8, and so this is probably fixed. If we had a test case, we could actually
find out...
|
|
| Date |
User |
Action |
Args |
| 2007-02-19 15:02:45 | drewp | create | |
| 2007-03-06 07:58:49 | kowey | set | status: unread -> unknown
nosy:
droundy, tommy, beschmi, kowey, drewp
messages:
+ msg1504
title: pending has conflicts!" report -> Yikes, pending has conflicts! (1.0.8) |
| 2008-01-19 06:22:49 | markstos | set | status: unknown -> waiting-for
nosy:
+ markstos
messages:
+ msg2587 |
| 2008-01-19 13:04:00 | droundy | set | status: waiting-for -> resolved-in-unstable
nosy:
droundy, tommy, beschmi, kowey, markstos, drewp
messages:
+ msg2596 |
| 2008-02-16 03:48:41 | markstos | link | issue251 superseder |
| 2008-09-04 21:30:30 | admin | set | status: resolved-in-unstable -> resolved
nosy:
+ dagit |
| 2009-08-06 17:46:13 | admin | set | nosy:
+ jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, simon, thorkilnaur, - droundy, drewp |
| 2009-08-06 20:41:57 | admin | set | nosy:
- beschmi |
| 2009-08-10 22:02:02 | admin | set | nosy:
+ drewp, - darcs-devel, zooko, jast, Serware, mornfall |
| 2009-08-10 23:59:33 | admin | set | nosy:
- dagit |
| 2009-08-25 17:57:59 | admin | set | nosy:
+ darcs-devel, - simon |
| 2009-08-27 14:06:16 | admin | set | nosy:
tommy, kowey, markstos, darcs-devel, drewp, thorkilnaur, dmitry.kurochkin |
|
