darcs

Issue 248 pull => bug in function reconcile_unwindings (1.0.8)

Title pull => bug in function reconcile_unwindings (1.0.8)
Priority bug Status resolved
Milestone Resolved in
Superseder pull => bug in function reconcile_unwindings (** minimal test case **)
View: 194
Nosy List bvanevery, darcs-devel, dmitry.kurochkin, kowey, markstos, thorkilnaur, tommy
Assigned To
Topics Conflicts

Created on 2006-08-24.11:55:28 by bvanevery, last changed 2009-08-27.14:04:57 by admin.

Messages
msg930 (view) Author: bvanevery Date: 2006-08-24.11:55:17
E:\devel\src\chicken>darcs pull http://galinha.ucpel.tche.br/chicken
Pulling from "http://galinha.ucpel.tche.br/chicken"...

This is the development repository of the CHICKEN Scheme system
(http://www-call-with-current-continuation.org/)

See README.darcs for information about how to bootstrap the compiler.
**********************

Fri Aug 11 12:22:43 Pacific Daylight Time 2006  bunny351@gmail.com
  * - moved "chicken-home" into eval.scm
Shall I pull this patch? (1/11)  [ynWvpxqadjk], or ? for help:
darcs: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./Makefile.am 78
+# Note that the CMake version of nsample has proven that this benchmarking
+# is woefully inadequate, nearly a random number generator.  3 samples is
+# substandard as far as any kind of repeatability.  Also, if the
+# user starts a build, relegates it to a background task, and starts
+# multitasking apps in the foreground, the results will be completely 
bogus.
+# This is of course the usual way that people run their builds.  For this
+# reason, the CMake build disables nsample benchmarking by default.  A 
build
+# is simply not a proper benchmarking environment.
+#
+# The code remains in Makefile.am until a better policy is implemented.
+
merger 0.0 (
hunk ./Makefile.am 78
-chicken-defaults.h: nsample
+stack-size.h: nsample
hunk ./Makefile.am 78
-chicken-defaults.h: nsample
+chicken-defaults.h:
)
)
hunk ./Makefile.am 89
-stack-size.h: nsample
+stack-size.h: stack-size.h.in nsample
)
hunk ./Makefile.am 78
-chicken-defaults.h: nsample
-       @if [ -n "${NURSERY}" ]; then \
-         nursery=${NURSERY}; \
-         echo "setting nursery size to $${nursery}"; \
-       else \
-         nursery="128*1024"; \
-         echo "using default nursery size of 128k"; \
-       fi; \
-       echo the CHICKEN_HOME install directory is ${pkgdatadir}; \
-       echo creating $@; \
+chicken-defaults.h:
+       @echo creating $@; \
+       echo the CHICKEN_HOME install directory is $(pkgdatadir); \
)
merger 0.0 (
merger 0.0 (
hunk ./Makefile.am 86
+       echo creating $@; \
+       echo "/*** Program generated file: any edits may be lost ***/" 
 >stack-si
ze.h; \
+       echo "#ifndef C_DEFAULT_TARGET_STACK_SIZE" >> stack-size.h; \
+       echo "# define C_DEFAULT_TARGET_STACK_SIZE ($${nursery})" 
 >>stack-size.h
; \
+       echo "#endif" >> stack-size.h;
+
+chicken-paths.h:
hunk ./Makefile.am 86
-       echo the CHICKEN_HOME install directory is ${pkgdatadir}; \
+       echo the CHICKEN_HOME install directory is $(pkgdatadir); \
)
hunk ./Makefile.am 87
-       echo "/*** Program generated file: any edits may be lost ***/" 
 >stack-si
ze.h; \
-       echo "#ifndef C_DEFAULT_TARGET_STACK_SIZE" >> stack-size.h; \
-       echo "# define C_DEFAULT_TARGET_STACK_SIZE ($${nursery})" 
 >>stack-size.h
; \
-       echo "#endif" >> stack-size.h;
+       sed -e "s,@DEFAULT_TARGET_STACK_SIZE[@],($${nursery}),g" \
+          <$(srcdir)/stack-size.h.in >stack-size.h;
)
)
Please report this to bugs@darcs.net
If possible include the output of 'darcs --exact-version'.

E:\devel\src\chicken>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]

E:\devel\src\chicken>
msg2401 (view) Author: markstos Date: 2008-01-09.04:54:42
This bug is a duplicate of one that is resolved-in-unstable.
History
Date User Action Args
2006-08-24 11:55:28bvaneverycreate
2006-08-31 21:58:30jchsettitle: a bug on Windows win32 Darcs 1.0.8 -> bug in function reconcile_unwindings
2007-07-23 13:58:31koweysetstatus: unread -> deferred
nosy: + kowey, beschmi
topic: + Conflicts
superseder: + pull => bug in function reconcile_unwindings (** minimal test case **)
title: bug in function reconcile_unwindings -> pull => bug in function reconcile_unwindings (1.0.8)
2007-08-03 17:20:45droundysetstatus: deferred -> duplicate
2008-01-09 04:54:44markstossetstatus: duplicate -> resolved-in-unstable
nosy: + markstos
messages: + msg2401
2008-09-04 21:29:02adminsetstatus: resolved-in-unstable -> resolved
nosy: + dagit
2009-08-06 17:43:07adminsetnosy: + jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, simon, thorkilnaur, - droundy, bvanevery
2009-08-06 20:40:12adminsetnosy: - beschmi
2009-08-10 21:54:47adminsetnosy: + bvanevery, - darcs-devel, zooko, jast, Serware, mornfall
2009-08-10 23:55:42adminsetnosy: - dagit
2009-08-25 17:56:24adminsetnosy: + darcs-devel, - simon
2009-08-27 14:04:57adminsetnosy: tommy, kowey, markstos, darcs-devel, bvanevery, thorkilnaur, dmitry.kurochkin