[prev in list] [next in list] [prev in thread] [next in thread] 

List:       darcs-devel
Subject:    [darcs-devel] [darcs #400]
From:       "Lendvai Attila via RT" <bugs () darcs ! net>
Date:       2005-05-26 13:33:52
Message-ID: rt-3.0.12-400-2005.14.7712206153358 () darcs ! net
[Download RAW message or body]


Thu May 26 09:33:51 2005: New ticket: 400.
Transaction: Ticket created by Attila.Lendvai@netvisor.hu
       Queue: Darcs
     Subject: (No subject given)
       Owner: Nobody
  Requestors: Attila.Lendvai@netvisor.hu
      Status: new
 Ticket <URL: http://bugs.darcs.net/.//Ticket/Display.html?id=400 >


$ darcs pull --no-set-default http://slate.tunes.org/repos/alpha

Mon Apr  4 03:38:57 Central Europe Daylight Time 2005  Brian T. Rice
<water@tunes.org>
  * Removed Collection requirement from addAll: and removeAll:.
Shall I pull this patch? (1/221) [ynWvxqadjk], or ? for help:

Fail: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./vm.c 32
-struct Root;
+struct RoleEntry;
hunk ./vm.c 33
+struct ObjectHeap;
+struct PrimitiveMethod;
+struct ObjectPayload;
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./vm.c 27
+struct MethodCacheEntry;
+struct LexicalContext;
merger 0.0 (
hunk ./vm.c 23
-struct ByteArray;
-struct Symbol;
-struct LexicalContext;
-struct MethodDefinition;
+struct Map;
+struct Object;
+struct SlotTable;
merger 0.0 (
hunk ./vm.c 20
-struct ObjectPayload;
-struct RoleEntry;
+struct CompiledMethod;
+struct Interpreter;
hunk ./vm.c 20
-struct ObjectPayload;
-struct RoleEntry;
-struct SlotEntry;
-struct ByteArray;
-struct Symbol;
-struct LexicalContext;
-struct MethodDefinition;
-struct OopArray;
-struct ObjectHeader;
-struct RoleTable;
-struct PrimitiveMethod;
)
)
)
hunk ./vm.c 30
-struct RoleTable;
-struct PrimitiveMethod;
-struct ObjectHeap;
+struct ByteArray;
+struct MethodDefinition;
+struct Symbol;
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./vm.c 23
-struct ByteArray;
-struct Symbol;
-struct LexicalContext;
-struct MethodDefinition;
+struct Map;
+struct Object;
+struct SlotTable;
merger 0.0 (
hunk ./vm.c 20
-struct ObjectPayload;
-struct RoleEntry;
+struct CompiledMethod;
+struct Interpreter;
hunk ./vm.c 20
-struct ObjectPayload;
-struct RoleEntry;
-struct SlotEntry;
-struct ByteArray;
-struct Symbol;
-struct LexicalContext;
-struct MethodDefinition;
-struct OopArray;
-struct ObjectHeader;
-struct RoleTable;
-struct PrimitiveMethod;
)
)
hunk ./vm.c 27
+struct MethodCacheEntry;
+struct LexicalContext;
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./vm.c 20
-struct ObjectPayload;
-struct RoleEntry;
+struct CompiledMethod;
+struct Interpreter;
hunk ./vm.c 20
-struct ObjectPayload;
-struct RoleEntry;
-struct SlotEntry;
-struct ByteArray;
-struct Symbol;
-struct LexicalContext;
-struct MethodDefinition;
-struct OopArray;
-struct ObjectHeader;
-struct RoleTable;
-struct PrimitiveMethod;
)
hunk ./vm.c 23
-struct ByteArray;
-struct Symbol;
-struct LexicalContext;
-struct MethodDefinition;
+struct Map;
+struct Object;
+struct SlotTable;
)
merger 0.0 (
merger 0.0 (
hunk ./vm.c 20
-struct ObjectPayload;
-struct RoleEntry;
-struct SlotEntry;
-struct ByteArray;
-struct Symbol;
-struct LexicalContext;
-struct MethodDefinition;
-struct OopArray;
-struct ObjectHeader;
-struct RoleTable;
-struct PrimitiveMethod;
hunk ./vm.c 20
-struct ObjectPayload;
-struct RoleEntry;
+struct CompiledMethod;
+struct Interpreter;
)
hunk ./vm.c 20
-struct ObjectHeap;
-struct RoleEntry;
-struct BreakEntry;
-struct Object;
-struct MethodCacheEntry;
-struct Map;
)
)
)
)
)
merger 0.0 (
hunk ./vm.c 46
-struct SlotTable;
merger 0.0 (
hunk ./vm.c 44
+struct PrimitiveMethod;
merger 0.0 (
hunk ./vm.c 37
+struct MethodDefinition;
+struct ObjectPayload;
+struct ObjectHeader;
+struct OopArray;
+struct Symbol;
+struct SlotEntry;
merger 0.0 (
hunk ./vm.c 35
+struct MethodCacheEntry;
merger 0.0 (
hunk ./vm.c 34
-struct MethodCacheEntry;
hunk ./vm.c 34
-struct MethodCacheEntry;
-struct Object;
-struct Map;
-struct CompiledMethod;
-struct Interpreter;
-struct SlotTable;
+struct RoleEntry;
)
)
)
)
)
)
Please report this to bugs@darcs.net
If possible include the output of 'darcs --exact-version'.

ati@ATIWKS /cygdrive/i/work/slate/alpha
$ darcs --exact-version
darcs compiled on Feb  4 2005, at 09:02:07
# configured Fri Feb 4 08:56:21 USMST 2005
sh ./configure --disable-mmap --target=mingw

Context:

[TAG 1.0.2
David Roundy <droundy@abridgegame.org>**20050204123805]


ati@ATIWKS /cygdrive/i/work/slate/alpha
$


_______________________________________________
darcs-devel mailing list
darcs-devel@darcs.net
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
[prev in list] [next in list] [prev in thread] [next in thread]