Created on 2006-09-29.23:48:26 by james.vanlommel, last changed 2009-08-27.14:05:16 by admin.
|
| File name |
Uploaded |
Type |
Edit |
Remove |
|
smime.p7s
|
james.vanlommel,
2006-09-29.23:48:13
|
application/x-pkcs7-signature |
|
|
| msg1026 (view) |
Author: james.vanlommel |
Date: 2006-09-29.23:48:13 |
|
And it asked me to mail you. :)
jvanlommel htdocs % darcs push
Pushing to "r:/webdata/domains/slocourt-staging/"...
Fri Sep 29 16:41:39 PDT 2006 James Van Lommel
<james.vanlommel@slo.courts.ca.gov>
* WebApps: changed/removed settings files.
These are no longer as necessary since we now use Apache2's .conf files to
set the PHP include paths.
Shall I push this patch? (1/1) [ynWvpxqadjk], or ? for help:
darcs: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
regrem 0.0 (
hunk ./webapps/minute_order/settings/settings.inc.php 11
-ini_set('include_path','.;c:\php\pear;c:\webdata\slocourt intranet -
test\intranet\php.inc');
+// ini_set('include_path','.;c:\php\pear;c:\webdata\slocourt intranet -
test\intranet\php.inc');
hunk ./webapps/minute_order/settings/settings.inc.php 10
-// the slocourt-test environment
-ini_set('include_path','.;c:\php\pear;c:\webdata\slocourt intranet -
test\intranet\php.inc');
+// for slocourt-test environment
+// ini_set('include_path','.;c:\php\pear;c:\webdata\slocourt intranet -
test\intranet\php.inc');
)
merger 0.0 (
hunk ./webapps/minute_order/settings/settings.inc.php 8
-ini_set('include_path','.;c:\php\pear;c:\webdata\intranet\intranet\php.inc');
+ini_set('include_path','.;c:\php\pear;c:\webdata\domains\slocourt-staging\intra
net\php.inc');
merger 0.0 (
merger 0.0 (
hunk ./webapps/minute_order/settings/settings.inc.php 10
-// the slocourt-test environment
-ini_set('include_path','.;c:\php\pear;c:\webdata\slocourt intranet -
test\intranet\php.inc');
+// for slocourt-test environment
+// ini_set('include_path','.;c:\php\pear;c:\webdata\slocourt intranet -
test\intranet\php.inc');
hunk ./webapps/minute_order/settings/settings.inc.php 11
-ini_set('include_path','.;c:\php\pear;c:\webdata\slocourt intranet -
test\intranet\php.inc');
+// ini_set('include_path','.;c:\php\pear;c:\webdata\slocourt intranet -
test\intranet\php.inc');
)
merger 0.0 (
hunk ./webapps/minute_order/settings/settings.inc.php 8
-//
ini_set('include_path','.;c:\php\pear;c:\webdata\intranet\intranet\php.inc')
;
+ini_set('include_path','.;c:\php\pear;c:\webdata\intranet\intranet\php.inc');
hunk ./webapps/minute_order/settings/settings.inc.php 1
-<?php
-/*
- Global setting to configure include path.
- Comment out everything if on Dilbert.
-*/
-
-// for slocourt-staging environment
-//
ini_set('include_path','.;c:\php\pear;c:\webdata\intranet\intranet\php.inc')
;
-
-// for slocourt-test environment
-// ini_set('include_path','.;c:\php\pear;c:\webdata\slocourt intranet -
test\in
tranet\php.inc');
-?>
)
)
)
)
Please report this to bugs@darcs.net
jvanlommel htdocs % darcs --exact-version
darcs compiled on Jun 16 2006, at 13:00:32
# configured Fri Jun 16 12:59:52 USMST 2006
./configure --disable-mmap
Context:
[TAG 1.0.8
Tommy Pettersson <ptp@lysator.liu.se>**20060616160213]
- James
Attachments
|
| msg1029 (view) |
Author: kowey |
Date: 2006-10-01.20:08:14 |
|
Thanks for the bug report.
This appears to be a known bug, sadly one that we do not know yet how to fix.
Deferring until we actually succeed it. Note that the superseder,
issue194, offers what might be a helpful workaround.
|
| msg2390 (view) |
Author: markstos |
Date: 2008-01-09.04:23:05 |
|
This bug is a duplicate one that is resolved-in-unstable.
|
|
| Date |
User |
Action |
Args |
| 2006-09-29 23:48:26 | james.vanlommel | create | |
| 2006-10-01 20:08:20 | kowey | set | status: unread -> deferred
nosy:
droundy, tommy, kowey, james.vanlommel
superseder:
+ pull => bug in function reconcile_unwindings (** minimal test case **)
messages:
+ msg1029 |
| 2006-12-18 21:36:08 | jch | set | nosy:
droundy, tommy, kowey, james.vanlommel
title: darcs 1.0.8 bug report -> darcs 1.0.8: reconcile_unwindings again |
| 2007-07-18 08:06:21 | kowey | set | topic:
+ Conflicts
nosy:
+ beschmi
title: darcs 1.0.8: reconcile_unwindings again -> pull => bug in function reconcile_unwindings (1.0.8) |
| 2007-08-03 17:24:04 | droundy | set | status: deferred -> duplicate |
| 2008-01-09 04:23:06 | markstos | set | status: duplicate -> resolved-in-unstable
nosy:
+ markstos
messages:
+ msg2390 |
| 2008-09-04 21:29:25 | admin | set | status: resolved-in-unstable -> resolved
nosy:
+ dagit |
| 2009-08-06 17:40:43 | admin | set | nosy:
+ jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, simon, thorkilnaur, - droundy, james.vanlommel |
| 2009-08-06 20:37:52 | admin | set | nosy:
- beschmi |
| 2009-08-10 21:56:09 | admin | set | nosy:
+ james.vanlommel, - darcs-devel, zooko, jast, Serware, mornfall |
| 2009-08-10 23:56:30 | admin | set | nosy:
- dagit |
| 2009-08-25 17:54:15 | admin | set | nosy:
+ darcs-devel, - simon |
| 2009-08-27 14:05:16 | admin | set | nosy:
tommy, kowey, markstos, darcs-devel, james.vanlommel, thorkilnaur, dmitry.kurochkin |
|
