Created on 2008-02-08.04:13:36 by markstos, last changed 2009-08-27.14:08:47 by admin.
msg3230 (view) |
Author: markstos |
Date: 2008-02-08.04:13:34 |
|
The following test script causes the result:
"darcs failed: Error applying hunk to file ./t.t
Error applying patch to the working directory."
The script to reproduce it with a darcs-unstable build is:
#!/bin/sh
IFS='';
export IFS;
EMAIL=tester;
export EMAIL;
set -v;
rm -rf tmp;
darcs init --hashed --repodir=tmp
touch tmp/t.t
cd tmp
darcs add t.t
echo 'content'>t.t
darcs record -am 'initial add' --ignore
echo 'content: remote change'>t.t
darcs record -am 'remote change' --ignore
darcs put tmp2
cd tmp2
darcs obliterate --last 1 --all;
echo 'content: local change'> t.t
darcs pull -a ../
darcs w -s
darcs revert
|
msg3322 (view) |
Author: droundy |
Date: 2008-02-11.16:46:05 |
|
Hi Mark,
Could you add this as a test in the bugs/ directory? (Sorry, I'm feeling
overwhelmed today.) And thanks for the report!
|
msg3431 (view) |
Author: markstos |
Date: 2008-02-14.23:12:49 |
|
David,
I've added this test to bugs/ now. It still fails with the build from yesterday
(2/13). The patches from 2/14 are still being compiled into a new binary.
|
msg3454 (view) |
Author: droundy |
Date: 2008-02-15.19:25:22 |
|
The following patch updated the status of issue662 to be resolved in the unstable branch:
* resolved issue662: fix bug in bugs/pull.sh test, which now passes.
You can view the patch details online here:
http://darcs.net/cgi-bin/darcs.cgi/unstable/?c=annotate&p=20080215152814-72aca-4b9117f142f0d1903b1c2c27ad1a4c54c0c76cc1.gz
|
msg3457 (view) |
Author: droundy |
Date: 2008-02-15.20:27:33 |
|
The following patch updated the status of issue662 to be resolved in the unstable branch:
* resolved issue662: fix bug in bugs/pull.sh test, which now passes.
You can view the patch details online here:
http://darcs.net/cgi-bin/darcs.cgi/unstable/?c=annotate&p=20080215152814-72aca-4b9117f142f0d1903b1c2c27ad1a4c54c0c76cc1.gz
|
|
Date |
User |
Action |
Args |
2008-02-08 04:13:36 | markstos | create | |
2008-02-09 14:38:41 | markstos | link | issue668 superseder |
2008-02-11 16:46:06 | droundy | set | nosy:
droundy, tommy, beschmi, kowey, markstos messages:
+ msg3322 |
2008-02-11 18:07:41 | markstos | set | status: unknown -> has-patch nosy:
droundy, tommy, beschmi, kowey, markstos assignedto: markstos |
2008-02-14 23:12:58 | markstos | set | topic:
+ Confirmed, IncludesExampleOrTest nosy:
droundy, tommy, beschmi, kowey, markstos messages:
+ msg3431 assignedto: markstos -> droundy |
2008-02-15 19:25:24 | droundy | set | status: has-patch -> resolved-in-unstable nosy:
droundy, tommy, beschmi, kowey, markstos messages:
+ msg3454 title: pull => darcs failed: Error applying hunk to file -> fix bug in bugs/pull.sh test, which now passes. |
2008-02-15 20:27:35 | droundy | set | nosy:
+ darcs-bugs messages:
+ msg3457 |
2008-09-04 21:32:25 | admin | set | status: resolved-in-unstable -> resolved nosy:
+ dagit |
2009-08-06 17:53:48 | admin | set | nosy:
+ jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, simon, thorkilnaur, - droundy, darcs-bugs |
2009-08-06 20:57:12 | admin | set | nosy:
- beschmi |
2009-08-10 22:14:09 | admin | set | nosy:
+ darcs-bugs, - darcs-devel, zooko, jast, Serware, mornfall |
2009-08-11 00:06:29 | admin | set | nosy:
- dagit |
2009-08-25 18:05:09 | admin | set | nosy:
+ darcs-devel, - simon |
2009-08-27 14:08:47 | admin | set | nosy:
tommy, kowey, markstos, darcs-devel, thorkilnaur, darcs-bugs, dmitry.kurochkin |
|