Hello,

I get the following output when I try to apply a patch file that was sent to me:

darcs: bug in darcs!
in function new_ur
Original patch:
merger 0.9 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./skysheet.asd 23
-               (:file "client" :depends-on ("server" "layout")))
+               (:file "client" :depends-on ("server" "layout"))
+	       (:file "unit-test" :depends-on ("sheet")))
merger 0.0 (
hunk ./skysheet.asd 23
-               (:file "command-processor" :depends-on ("util"))
hunk ./skysheet.asd 24
+               (:file "formula-evaluation" :depends-on ("command-processor"))
)
)
hunk ./skysheet.asd 22
-               (:file "layout" :depends-on ("skyscript"))
-               (:file "client" :depends-on ("server" "layout"))
+               (:file "client" :depends-on ("server"))
)
merger 0.0 (
hunk ./skysheet.asd 21
-	       (:file "skyscript" :depends-on ("jsgen" "libs/css-lite" "server"))
merger 0.0 (
hunk ./skysheet.asd 16
-	       (:file "sheet" :depends-on ("sparse-vectors" "util"))
+	       (:file "skyscript" :depends-on ("jsgen" "libs/css-lite"))
+               (:file "layout" :depends-on ("skyscript"))
+	       (:file "sheet" :depends-on ("sparse-vectors" "layout" "util"))
hunk ./skysheet.asd 7
-               (:file "formula-functions" :depends-on ("packages"))
-               (:file "formula-parser" :depends-on
("libs/parse-number" "formula-functions"))
-               (:file "packages" :depends-on ("libs/css-lite"))
-	       (:file "pg-util" :depends-on ("packages"))
-	       (:file "sparse-vectors" :depends-on ("packages"))
-	       (:file "util" :depends-on ("pg-util"))
-	       (:file "htmlgen" :depends-on ("util"))
-	       (:file "jsgen" :depends-on ("util"))
-               (:file "user-agent" :depends-on ("packages"))
-	       (:file "sheet" :depends-on ("sparse-vectors" "util"))
-               (:file "command-processor" :depends-on ("util"))
-	       (:file "server" :depends-on ("htmlgen" "sheet"
"command-processor" "user-agent"))
-	       (:file "skyscript" :depends-on ("jsgen" "libs/css-lite" "server"))
-	       (:file "js-profiler" :depends-on ("skyscript"))
-               (:file "layout" :depends-on ("skyscript"))
-               (:file "command-processor" :depends-on ("util"))
-               (:file "client" :depends-on ("server" "layout")))
+               (:file "packages")
+               (:file "user-agent") ;; maybe this should be factored
out into its own library?
+               (:file "sparse-vectors")
+               (:file "pg-util")
+               (:file "util")
+               (:file "formula-functions")
+               (:file "formula-parser")
+               (:file "htmlgen")
+               (:file "jsgen")
+               (:file "command-processor")
+               (:file "formula-evaluation")
+               (:file "server")
+               (:file "skyscript")
+               (:file "layout")
+               (:file "unit-test")
+               (:file "sheet")
+               (:file "js-profiler")
+               (:file "client"))
)
)
)
hunk ./skysheet.asd 21
-	       (:file "js-profiler" :depends-on ("skyscript"))
+	       (:file "js-profiler" :depends-on ("server"))
)
Unwound:
merger 0.9 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./skysheet.asd 23
-               (:file "client" :depends-on ("server" "layout")))
+               (:file "client" :depends-on ("server" "layout"))
+	       (:file "unit-test" :depends-on ("sheet")))
merger 0.0 (
hunk ./skysheet.asd 23
-               (:file "command-processor" :depends-on ("util"))
hunk ./skysheet.asd 24
+               (:file "formula-evaluation" :depends-on ("command-processor"))
)
)
hunk ./skysheet.asd 22
-               (:file "layout" :depends-on ("skyscript"))
-               (:file "client" :depends-on ("server" "layout"))
+               (:file "client" :depends-on ("server"))
)
merger 0.0 (
hunk ./skysheet.asd 21
-	       (:file "skyscript" :depends-on ("jsgen" "libs/css-lite" "server"))
merger 0.0 (
hunk ./skysheet.asd 16
-	       (:file "sheet" :depends-on ("sparse-vectors" "util"))
+	       (:file "skyscript" :depends-on ("jsgen" "libs/css-lite"))
+               (:file "layout" :depends-on ("skyscript"))
+	       (:file "sheet" :depends-on ("sparse-vectors" "layout" "util"))
hunk ./skysheet.asd 7
-               (:file "formula-functions" :depends-on ("packages"))
-               (:file "formula-parser" :depends-on
("libs/parse-number" "formula-functions"))
-               (:file "packages" :depends-on ("libs/css-lite"))
-	       (:file "pg-util" :depends-on ("packages"))
-	       (:file "sparse-vectors" :depends-on ("packages"))
-	       (:file "util" :depends-on ("pg-util"))
-	       (:file "htmlgen" :depends-on ("util"))
-	       (:file "jsgen" :depends-on ("util"))
-               (:file "user-agent" :depends-on ("packages"))
-	       (:file "sheet" :depends-on ("sparse-vectors" "util"))
-               (:file "command-processor" :depends-on ("util"))
-	       (:file "server" :depends-on ("htmlgen" "sheet"
"command-processor" "user-agent"))
-	       (:file "skyscript" :depends-on ("jsgen" "libs/css-lite" "server"))
-	       (:file "js-profiler" :depends-on ("skyscript"))
-               (:file "layout" :depends-on ("skyscript"))
-               (:file "command-processor" :depends-on ("util"))
-               (:file "client" :depends-on ("server" "layout")))
+               (:file "packages")
+               (:file "user-agent") ;; maybe this should be factored
out into its own library?
+               (:file "sparse-vectors")
+               (:file "pg-util")
+               (:file "util")
+               (:file "formula-functions")
+               (:file "formula-parser")
+               (:file "htmlgen")
+               (:file "jsgen")
+               (:file "command-processor")
+               (:file "formula-evaluation")
+               (:file "server")
+               (:file "skyscript")
+               (:file "layout")
+               (:file "unit-test")
+               (:file "sheet")
+               (:file "js-profiler")
+               (:file "client"))
)
)
)
hunk ./skysheet.asd 21
-	       (:file "js-profiler" :depends-on ("skyscript"))
+	       (:file "js-profiler" :depends-on ("server"))
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./skysheet.asd 23
-               (:file "client" :depends-on ("server" "layout")))
+               (:file "client" :depends-on ("server" "layout"))
+	       (:file "unit-test" :depends-on ("sheet")))
merger 0.0 (
hunk ./skysheet.asd 23
-               (:file "command-processor" :depends-on ("util"))
hunk ./skysheet.asd 24
+               (:file "formula-evaluation" :depends-on ("command-processor"))
)
)
hunk ./skysheet.asd 22
-               (:file "layout" :depends-on ("skyscript"))
-               (:file "client" :depends-on ("server" "layout"))
+               (:file "client" :depends-on ("server"))
)
merger 0.0 (
hunk ./skysheet.asd 21
-	       (:file "skyscript" :depends-on ("jsgen" "libs/css-lite" "server"))
merger 0.0 (
hunk ./skysheet.asd 16
-	       (:file "sheet" :depends-on ("sparse-vectors" "util"))
+	       (:file "skyscript" :depends-on ("jsgen" "libs/css-lite"))
+               (:file "layout" :depends-on ("skyscript"))
+	       (:file "sheet" :depends-on ("sparse-vectors" "layout" "util"))
hunk ./skysheet.asd 7
-               (:file "formula-functions" :depends-on ("packages"))
-               (:file "formula-parser" :depends-on
("libs/parse-number" "formula-functions"))
-               (:file "packages" :depends-on ("libs/css-lite"))
-	       (:file "pg-util" :depends-on ("packages"))
-	       (:file "sparse-vectors" :depends-on ("packages"))
-	       (:file "util" :depends-on ("pg-util"))
-	       (:file "htmlgen" :depends-on ("util"))
-	       (:file "jsgen" :depends-on ("util"))
-               (:file "user-agent" :depends-on ("packages"))
-	       (:file "sheet" :depends-on ("sparse-vectors" "util"))
-               (:file "command-processor" :depends-on ("util"))
-	       (:file "server" :depends-on ("htmlgen" "sheet"
"command-processor" "user-agent"))
-	       (:file "skyscript" :depends-on ("jsgen" "libs/css-lite" "server"))
-	       (:file "js-profiler" :depends-on ("skyscript"))
-               (:file "layout" :depends-on ("skyscript"))
-               (:file "command-processor" :depends-on ("util"))
-               (:file "client" :depends-on ("server" "layout")))
+               (:file "packages")
+               (:file "user-agent") ;; maybe this should be factored
out into its own library?
+               (:file "sparse-vectors")
+               (:file "pg-util")
+               (:file "util")
+               (:file "formula-functions")
+               (:file "formula-parser")
+               (:file "htmlgen")
+               (:file "jsgen")
+               (:file "command-processor")
+               (:file "formula-evaluation")
+               (:file "server")
+               (:file "skyscript")
+               (:file "layout")
+               (:file "unit-test")
+               (:file "sheet")
+               (:file "js-profiler")
+               (:file "client"))
)
)
)
merger 0.0 (
merger 0.0 (
hunk ./skysheet.asd 23
-               (:file "client" :depends-on ("server" "layout")))
+               (:file "client" :depends-on ("server" "layout"))
+	       (:file "unit-test" :depends-on ("sheet")))
merger 0.0 (
hunk ./skysheet.asd 23
-               (:file "command-processor" :depends-on ("util"))
hunk ./skysheet.asd 24
+               (:file "formula-evaluation" :depends-on ("command-processor"))
)
)
hunk ./skysheet.asd 22
-               (:file "layout" :depends-on ("skyscript"))
-               (:file "client" :depends-on ("server" "layout"))
+               (:file "client" :depends-on ("server"))
)
hunk ./skysheet.asd 21
-	       (:file "skyscript" :depends-on ("jsgen" "libs/css-lite" "server"))
merger 0.0 (
hunk ./skysheet.asd 24
-               (:file "client" :depends-on ("server" "layout")))
+               (:file "client" :depends-on ("server" "layout"))
+	       (:file "unit-test" :depends-on ("sheet")))
merger 0.0 (
hunk ./skysheet.asd 24
-               (:file "command-processor" :depends-on ("util"))
hunk ./skysheet.asd 25
+               (:file "formula-evaluation" :depends-on ("command-processor"))
)
)
hunk ./skysheet.asd 22
-               (:file "client" :depends-on ("server" "layout")))
+               (:file "client" :depends-on ("server" "layout"))
+	       (:file "unit-test" :depends-on ("sheet")))
hunk ./skysheet.asd 24
-               (:file "command-processor" :depends-on ("util"))
hunk ./skysheet.asd 16
-	       (:file "sheet" :depends-on ("sparse-vectors" "util"))
+	       (:file "skyscript" :depends-on ("jsgen" "libs/css-lite"))
+               (:file "layout" :depends-on ("skyscript"))
+	       (:file "sheet" :depends-on ("sparse-vectors" "layout" "util"))
Please report this to bugs@darcs.net
If possible include the output of 'darcs --exact-version'.

Here's the output of --exact-version:

darcs compiled on Aug 28 2007, at 18:50:44
# configured Sat Jun 16 09:59:48 PDT 2007
./configure /usr/local/share/config.site /usr/local/etc/config.site

Context:

[TAG 1.0.9
Tommy Pettersson <ptp@lysator.liu.se>**20070603213706]

I had the same thing happen with the statically compiled 1.0.8 binary,
which made me download the 1.0.9 binary. Unfortunately I don't have
the time right now to get GHC and compile darcs from source to see if
this bug is present in the latest code. Let me know if you need more
specific information to track down what's wrong.

Thank you,
Vladimir

vsedach,

What happens when you try to repeat the test with a darcs built from the
"unstable" repo? This looks like the kind of thing that "darcs 2" might fix.

If you are using a Linux, I could possibly send you a binary I built, and many
Linux distros now have "ghc" pre-built for yo. 

Also, if you could send us a test case to reproduce the issue, that would be ideal.

Hello,

I think the issue is that the patches I am trying to apply come from a
repository to which I have sent patches that have been reviewed and
applied by hand, and then recorded into new patches, so some of my
changes are coming back to me in different patches. I'm not sure yet
if this is the exact cause, but it looks like the main thing me and my
repo-buddy are doing wrong (I have since asked him to stop
hand-merging my changes - previously it was just an annoyance, but
since this bug started popping up for me there is a big issue). I have
some more time to look into this now, so I will build the latest darcs
and see what I can come up with. I'll keep you updated.

Thank you,
Vladimir

On Jan 6, 2008 9:02 PM, Mark Stosberg <bugs@darcs.net> wrote:
>
> Mark Stosberg <mark@summersault.com> added the comment:
>
> vsedach,
>
> What happens when you try to repeat the test with a darcs built from the
> "unstable" repo? This looks like the kind of thing that "darcs 2" might fix.
>
> If you are using a Linux, I could possibly send you a binary I built, and many
> Linux distros now have "ghc" pre-built for yo.
>
> Also, if you could send us a test case to reproduce the issue, that would be ideal.
>
> ----------
> nosy: +markstos
> status: unread -> chatting
>
> __________________________________
> Darcs bug tracker <bugs@darcs.net>
> <http://bugs.darcs.net/issue565>
> __________________________________
>

vsedach,

Because your report sounds like several that are resolved with "Darcs 2", I'm
marking it as "resolved in unstable".  If you still experience the issue a build
of Darcs 2, pleaes re-open the issue.