darcs

Issue 22 make slowtest => bug in function reconcile_unwindings (1.0.5rc1)

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

Created on 2005-11-25.20:22:56 by tommy, last changed 2009-08-27.14:03:39 by admin.

Messages
msg85 (view) Author: tommy Date: 2005-11-25.20:22:56
I got this from a 'make slowtest' (darcs 1.0.5rc1):

Checking the unravelling of a merge of a sequence... 69
Fail: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
{
replace ./nRhQgY6rSYmYbY85JJMGwxEP [A-Za-z] new old
addfile ./hello
}
hunk ./8YFgGTF 8
-this silly hello
+a world token
)
merger 0.0 (
merger 0.0 (
move ./hello ./test
move ./hello ./world
)
hunk ./world 15
-}
-}
+TrUnkLCFMWWUT1-LwL
+{
)
)
Please report this to bugs@darcs.net
If possible include the output of 'darcs --exact-version'.
make: *** [test_unit] Fel 1
msg87 (view) Author: droundy Date: 2005-11-26.14:45:18
On Fri, Nov 25, 2005 at 08:22:56PM +0000, Tommy Pettersson wrote:
> I got this from a 'make slowtest' (darcs 1.0.5rc1):
> 
> Checking the unravelling of a merge of a sequence... 69
> Fail: bug in darcs!
> in function reconcile_unwindings

This is a known issue, which is unlikely to be fixed until the conflictor
work goes in.  I believe that the merger code may be impossible to get
right.  :(
-- 
David Roundy
http://www.darcs.net
msg2395 (view) Author: markstos Date: 2008-01-09.04:34:35
This bug is a duplicate one that is resolved-in-unstable.
History
Date User Action Args
2005-11-25 20:22:56tommycreate
2005-11-26 14:45:19droundysetstatus: unread -> unknown
messages: + msg87
2007-07-18 08:19:30koweysetstatus: unknown -> deferred
topic: + Conflicts
superseder: + pull => bug in function reconcile_unwindings (** minimal test case **)
nosy: + kowey, beschmi
title: bug in function reconcile_unwindings -> pull => bug in function reconcile_unwindings (1.0.5rc1)
2007-07-18 08:19:50koweysettitle: pull => bug in function reconcile_unwindings (1.0.5rc1) -> make slowtest => bug in function reconcile_unwindings (1.0.5rc1)
2007-07-18 08:22:03koweylinkissue96 superseder
2007-08-03 17:21:22droundysetstatus: deferred -> duplicate
2008-01-09 04:34:37markstossetstatus: duplicate -> resolved-in-unstable
nosy: + markstos
messages: + msg2395
2008-09-04 21:27:42adminsetstatus: resolved-in-unstable -> resolved
nosy: + dagit
2009-08-06 17:32:55adminsetnosy: + jast, Serware, dmitry.kurochkin, darcs-devel, zooko, mornfall, simon, thorkilnaur, - droundy
2009-08-06 20:30:21adminsetnosy: - beschmi
2009-08-10 21:54:00adminsetnosy: - darcs-devel, zooko, jast, Serware, mornfall
2009-08-10 23:55:20adminsetnosy: - dagit
2009-08-25 17:47:40adminsetnosy: + darcs-devel, - simon
2009-08-27 14:03:39adminsetnosy: tommy, kowey, markstos, darcs-devel, thorkilnaur, dmitry.kurochkin