# HG changeset patch
# User Olivier Breuleux <breuleuo@iro.umontreal.ca>
# Date 1229649035 18000
# Node ID 86a63770af249e364e3172ac621a4a4103b7ff29
# Parent  5398a7a1eca7cd71929b8f0a55296025e31b369a
fixed small bug with filemerge

diff -r 5398a7a1eca7 -r 86a63770af24 pylearn/dbdict/newstuff.py
--- a/pylearn/dbdict/newstuff.py	Thu Dec 18 18:09:23 2008 -0500
+++ b/pylearn/dbdict/newstuff.py	Thu Dec 18 20:10:35 2008 -0500
@@ -588,10 +588,11 @@
         number=12 numbers.a=55 numbers.b=56
     """
     with open(mainfile) as f:
-        state = expand(parse(*map(str.strip, f.readlines())))
+        _state = parse(*map(str.strip, f.readlines()))
     for file in other_files:
         with open(file) as f:
-            state.update(expand(parse(*map(str.strip, f.readlines()))))
+            _state.update(parse(*map(str.strip, f.readlines())))
+    state = expand(_state)
     state.setdefault('dbdict', DD()).experiment = experiment
     experiment = resolve(experiment)
     if options.workdir and options.dry_run: