Created on 2006-07-03.20:51:38 by henrik, last changed 2009-10-23.23:54:06 by admin.
| msg744 (view) |
Author: hankhero |
Date: 2006-07-03.20:51:34 |
|
On darcs 1.0.7pre1.
Best wishes, Henrik Hjelte
darcs --exact-version
darcs compiled on Mar 1 2006, at 03:01:57
# configured Wed Mar 1 02:53:45 CET 2006
./configure --prefix=/afs/aei-potsdam.mpg.de/u/eschnett LDFLAGS=-static
--no-create --no-recursion
Context:
[bump version to 1.0.7pre1
Tommy Pettersson <ptp@lysator.liu.se>**20060301000323]
[show 1.0.6 as latest stable source on web page
Tommy Pettersson <ptp@lysator.liu.se>**20060301000158
Forgot this, again :-/
]
[TAG 1.0.6
Tommy Pettersson <ptp@lysator.liu.se>**20060228111841]
darcs: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./src/components/window.lisp 70
- (<:as-html (window-component.inline-javascript window)))))
+ (<:as-is (window-component.inline-javascript window)))))
hunk ./src/components/window.lisp 70
- (<:as-html (window-component.inline-javascript window)))))
+ (<:as-is (window-component.inline-javascript window)))))
)
hunk ./src/components/window.lisp 58
- :type "text/css"))
- (when (window-component.first-inline-javascript window)
- (<:script :type "text/javascript"
- (<:as-is (window-component.first-inline-javascript window))))
- (when (window-component.javascript window)
- (dolist (js (ensure-list (window-component.javascript window)))
- ;; most browsers (firefox, safari and ie at least) really,
- ;; really, really don't like empty script tags. The "" forces
- ;; yaclml to generate a seperate closing tag.
- (<:script :type "text/javascript" :src js "")))
- (when (window-component.inline-javascript window)
- (<:script :type "text/javascript"
- (<:as-is (window-component.inline-javascript window)))))
+ :type "text/css"))
+ (dolist* ((type value) (window-component.javascript window))
+ (ecase type
+ (:src
+ ;; most browsers (firefox, safari and ie at least) really,
+ ;; really, really don't like empty script tags. The "" forces
+ ;; yaclml to generate a seperate closing tag.
+ (<:script :type "text/javascript" :src value ""))
+ (:js
+ (<:script :type "text/javascript" (<:as-is value))))))
)
merger 0.0 (
hunk ./src/components/window.lisp 59
+ (when (window-component.first-inline-javascript window)
+ (<:script :type "text/javascript"
+ (<:as-is (window-component.first-inline-javascript window))))
hunk ./src/components/window.lisp 58
- :type "text/css"))
+ :type "text/css"))
+ (when (window-component.first-inline-javascript window)
+ (<:script :type "text/javascript"
+ (<:as-is (window-component.first-inline-javascript window))))
)
)
merger 0.0 (
merger 0.0 (
hunk ./src/components/window.lisp 58
- :type "text/css"))
- (when (window-component.first-inline-javascript window)
- (<:script :type "text/javascript"
- (<:as-is (window-component.first-inline-javascript window))))
- (when (window-component.javascript window)
- (dolist (js (ensure-list (window-component.javascript window)))
- ;; most browsers (firefox, safari and ie at least) really,
- ;; really, really don't like empty script tags. The "" forces
- ;; yaclml to generate a seperate closing tag.
- (<:script :type "text/javascript" :src js "")))
- (when (window-component.inline-javascript window)
- (<:script :type "text/javascript"
- (<:as-is (window-component.inline-javascript window)))))
+ :type "text/css"))
+ (dolist* ((type value) (window-component.javascript window))
+ (ecase type
+ (:src
+ ;; most browsers (firefox, safari and ie at least) really,
+ ;; really, really don't like empty script tags. The "" forces
+ ;; yaclml to generate a seperate closing tag.
+ (<:script :type "text/javascript" :src value ""))
+ (:js
+ (<:script :type "text/javascript" (<:as-is value))))))
merger 0.0 (
hunk ./src/components/window.lisp 70
- (<:as-html (window-component.inline-javascript window)))))
+ (<:as-is (window-component.inline-javascript window)))))
hunk ./src/components/window.lisp 70
- (<:as-html (window-component.inline-javascript window)))))
+ (<:as-is (window-component.inline-javascript window)))))
)
)
hunk ./src/components/window.lisp 67
+ (<:script :type "text/javascript" (<:as-is (js:js* value))))
+ (:script
)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./src/components/window.lisp 59
+ (when (window-component.first-inline-javascript window)
+ (<:script :type "text/javascript"
+ (<:as-is (window-component.first-inline-javascript window))))
hunk ./src/components/window.lisp 58
- :type "text/css"))
+ :type "text/css"))
+ (when (window-component.first-inline-javascript window)
+ (<:script :type "text/javascript"
+ (<:as-is (window-component.first-inline-javascript window))))
)
merger 0.0 (
merger 0.0 (
hunk ./src/components/window.lisp 70
- (<:as-html (window-component.inline-javascript window)))))
+ (<:as-is (window-component.inline-javascript window)))))
hunk ./src/components/window.lisp 70
- (<:as-html (window-component.inline-javascript window)))))
+ (<:as-is (window-component.inline-javascript window)))))
)
hunk ./src/components/window.lisp 58
- :type "text/css"))
- (when (window-component.first-inline-javascript window)
- (<:script :type "text/javascript"
- (<:as-is (window-component.first-inline-javascript window))))
- (when (window-component.javascript window)
- (dolist (js (ensure-list (window-component.javascript window)))
- ;; most browsers (firefox, safari and ie at least) really,
- ;; really, really don't like empty script tags. The "" forces
- ;; yaclml to generate a seperate closing tag.
- (<:script :type "text/javascript" :src js "")))
- (when (window-component.inline-javascript window)
- (<:script :type "text/javascript"
- (<:as-is (window-component.inline-javascript window)))))
+ :type "text/css"))
+ (dolist* ((type value) (window-component.javascript window))
+ (ecase type
+ (:src
+ ;; most browsers (firefox, safari and ie at least) really,
+ ;; really, really don't like empty script tags. The "" forces
+ ;; yaclml to generate a seperate closing tag.
+ (<:script :type "text/javascript" :src value ""))
+ (:js
+ (<:script :type "text/javascript" (<:as-is value))))))
)
)
hunk ./src/components/window.lisp 58
- :type "text/css"))
- (when (window-component.javascript window)
- (dolist (js (ensure-list (window-component.javascript window)))
- ;; most browsers (firefox, safari and ie at least) really,
- ;; really, really don't like empty script tags. The "" forces
- ;; yaclml to generate a seperate closing tag.
- (<:script :type "text/javascript" :src js "")))
- (when (window-component.inline-javascript window)
- (<:script :type "text/javascript"
- (<:as-html (window-component.inline-javascript window)))))
+ :type "text/css"))
+ (dolist* ((type value) (window-component.javascript window))
+ (ecase type
+ (:src
+ ;; most browsers (firefox, safari and ie at least) really,
+ ;; really, really don't like empty script tags. The "" forces
+ ;; yaclml to generate a seperate closing tag.
+ (<:script :type "text/javascript" :src value ""))
+ (:js
+ (<:script :type "text/javascript" (<:as-is (js:js* value))))
+ (:script
+ (<:script :type "text/javascript" (<:as-is value))))))
)
)
Please report this to bugs@darcs.net
If possible include the output of 'darcs --exact-version'.
|
| msg2388 (view) |
Author: markstos |
Date: 2008-01-09.04:21:30 |
|
This bug is a duplicate one that is resolved-in-unstable.
|
|
| Date |
User |
Action |
Args |
| 2006-07-03 20:51:38 | henrik | create | |
| 2006-07-03 21:03:36 | droundy | set | nosy:
droundy, tommy, henrik
superseder:
+ pull => bug in function reconcile_unwindings (** minimal test case **) |
| 2007-07-18 10:01:02 | kowey | set | status: unread -> deferred
nosy:
+ kowey, beschmi
topic:
+ Conflicts
title: bug in darcs! in function reconcile_unwindings -> bug in darcs! in function reconcile_unwindings (1.0.7pre1) |
| 2007-08-03 17:21:35 | droundy | set | status: deferred -> duplicate |
| 2008-01-09 04:21:32 | markstos | set | status: duplicate -> resolved-in-unstable
nosy:
+ markstos
messages:
+ msg2388 |
| 2008-09-04 21:28:40 | admin | set | status: resolved-in-unstable -> resolved
nosy:
+ dagit |
| 2009-08-06 17:33:19 | admin | set | nosy:
+ jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, simon, thorkilnaur, - droundy, henrik |
| 2009-08-06 20:30:45 | admin | set | nosy:
- beschmi |
| 2009-08-10 21:52:57 | admin | set | nosy:
+ henrik, - darcs-devel, zooko, jast, Serware, mornfall |
| 2009-08-10 23:54:49 | admin | set | nosy:
- dagit |
| 2009-08-25 17:48:03 | admin | set | nosy:
+ darcs-devel, - simon |
| 2009-08-27 14:04:40 | admin | set | nosy:
tommy, kowey, markstos, darcs-devel, henrik, thorkilnaur, dmitry.kurochkin |
| 2009-10-23 23:54:06 | admin | set | nosy:
+ hankhero, - henrik |
|
