[darcs-devel] [issue280] darcs 1.0.8 bug report

[Van Lommel, James]

New submission from Van Lommel, James <james.vanlommel at slo.courts.ca.gov>:

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 at 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 at 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 at lysator.liu.se>**20060616160213]

- James

----------
files: smime.p7s
messages: 1026
nosy: EricKow, droundy, james.vanlommel, tommy
status: unread
title: darcs 1.0.8 bug report

____________________________________
Darcs issue tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue280>
____________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3141 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20060929/e82b8c73/smime.bin