[darcs-devel] [darcs #424] Bug in reconcile_unwindings when pulling
patches and there are unrecorded changes
Paul_Berry at alumni.hmc.edu via RT
bugs at darcs.net
Sat Jun 4 22:08:18 PDT 2005
Sun Jun 05 01:08:14 2005: New ticket: 424.
Transaction: Ticket created by Paul_Berry at alumni.hmc.edu
Queue: Darcs
Subject: Bug in reconcile_unwindings when pulling patches and there are unrecorded changes
Owner: Nobody
Requestors: Paul_Berry at alumni.hmc.edu
Status: new
Ticket <URL: http://bugs.darcs.net/.//Ticket/Display.html?id=424 >
Hello--
I just got this error message from darcs version 1.0.3rc1, running on
Linux. Then I tried again with version 1.0.3, and got the same error.
Both versions were built locally on my machine using ghc version 6.4.
====
darcs: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./Kernel.hs 4
+ ,boolTycon
merger 0.0 (
hunk ./Kernel.hs 3
+ ,Tycon
+ ,funTycon
hunk ./Kernel.hs 3
+ ,Tycon
)
)
hunk ./Kernel.hs 3
- ,Tycon
- ,boolTycon
- ,funTycon
- ,HolType
- ,mkType
- ,mkVartype
- ,mkVartype_
- ,destType
- ,destVartype
- ,isVartype
- ,tyvars
- ,boolTy
- ,mkFunTy
- ,aty
- ,bty
)
merger 0.0 (
hunk ./Kernel.hs 6
+ ,mkVartype_
merger 0.0 (
hunk ./Kernel.hs 8
+ ,isVartype
merger 0.0 (
hunk ./Kernel.hs 4
+ ,mkType
+ ,mkVartype
merger 0.0 (
hunk ./Kernel.hs 6
+ ,tyvars
merger 0.0 (
hunk ./Kernel.hs 4
+ ,destType
+ ,destVartype
hunk ./Kernel.hs 4
+ ,destType
+ ,isVartype
)
)
)
)
)
)
Please report this to bugs at darcs.net
If possible include the output of 'darcs --exact-version'.
====
darcs --version outputs this:
1.0.3 (release)
darcs --exact-version outputs this:
darcs compiled on Jun 4 2005, at 21:52:38
# configured Tue May 24 18:34:35 EDT 2005
sh ./configure
Context:
[TAG 1.0.3
Tomasz Zielonka <tomasz.zielonka at gmail.com>**20050524215127]
====
The state of my codebase is this:
I have two branches, called holhs4 and holhs5. Holhs4 is a subset of
holhs5 (that is, all the patches in holhs4 are in holhs5, but many of
the patches in holhs5 aren't in holhs4). Holhs4 has some unrecorded
changes; holhs5 doesn't.
What I did:
I went to the holhs4 directory and ran "darcs pull ../holhs5/". Darcs said:
Pulling from "../holhs5"...
Mon May 30 12:25:23 PDT 2005 Paul_Berry at alumni.hmc.edu
* Started building preterm/pretype support.
Shall I pull this patch? (1/87) [ynWvpxqadjk], or ? for help:
I typed "a" and got the message I quoted above.
====
I would be glad to provide a bzipped tar archive of holhs4 and holhs5
if that would be useful. The size of the archive is 318k.
Thanks very much for your attention, and thanks for building such a
fine revision control system.
Paul Berry
Paul_Berry at alumni.hmc.edu
More information about the darcs-devel
mailing list