Index: trunk/tests/conf/tests/arr_merge.ref
===================================================================
--- trunk/tests/conf/tests/arr_merge.ref	(revision 34791)
+++ trunk/tests/conf/tests/arr_merge.ref	(revision 34792)
@@ -2,30 +2,30 @@
  I appearance/color/layer[] = <empty>
 === import 3 levels ===
 Result: 0
- I appearance/color/layer[0] = #000001 <<prio=200 from=embedded:4>> conf_rev=4
- I appearance/color/layer[1] = #000002 <<prio=200 from=embedded:4>> conf_rev=4
+ I appearance/color/layer[0] = #000001 <<prio=200 from=embedded:4>> conf_rev=3
+ I appearance/color/layer[1] = #000002 <<prio=200 from=embedded:4>> conf_rev=3
 Result: 0
- I appearance/color/layer[0] = #000101 <<prio=400 from=embedded:4>> conf_rev=8
- I appearance/color/layer[1] = #000102 <<prio=400 from=embedded:4>> conf_rev=8
+ I appearance/color/layer[0] = #000101 <<prio=400 from=embedded:4>> conf_rev=6
+ I appearance/color/layer[1] = #000102 <<prio=400 from=embedded:4>> conf_rev=6
 Result: 0
+ I appearance/color/layer[0] = #000201 <<prio=700 from=embedded:4>> conf_rev=9
+ I appearance/color/layer[1] = #000201 <<prio=700 from=embedded:4>> conf_rev=9
+=== change policy: design->prepend (2, 1) ===
  I appearance/color/layer[0] = #000201 <<prio=700 from=embedded:4>> conf_rev=12
  I appearance/color/layer[1] = #000201 <<prio=700 from=embedded:4>> conf_rev=12
-=== change policy: design->prepend (2, 1) ===
- I appearance/color/layer[0] = #000201 <<prio=700 from=embedded:4>> conf_rev=16
- I appearance/color/layer[1] = #000201 <<prio=700 from=embedded:4>> conf_rev=16
- I appearance/color/layer[2] = #000101 <<prio=400 from=embedded:4>> conf_rev=16
- I appearance/color/layer[3] = #000102 <<prio=400 from=embedded:4>> conf_rev=16
+ I appearance/color/layer[2] = #000101 <<prio=400 from=embedded:4>> conf_rev=12
+ I appearance/color/layer[3] = #000102 <<prio=400 from=embedded:4>> conf_rev=12
 === change policy: user->append (2, 0, 1) ===
- I appearance/color/layer[0] = #000201 <<prio=700 from=embedded:4>> conf_rev=20
- I appearance/color/layer[1] = #000201 <<prio=700 from=embedded:4>> conf_rev=20
- I appearance/color/layer[2] = #000001 <<prio=200 from=embedded:4>> conf_rev=20
- I appearance/color/layer[3] = #000002 <<prio=200 from=embedded:4>> conf_rev=20
- I appearance/color/layer[4] = #000101 <<prio=400 from=embedded:4>> conf_rev=20
- I appearance/color/layer[5] = #000102 <<prio=400 from=embedded:4>> conf_rev=20
+ I appearance/color/layer[0] = #000201 <<prio=700 from=embedded:4>> conf_rev=15
+ I appearance/color/layer[1] = #000201 <<prio=700 from=embedded:4>> conf_rev=15
+ I appearance/color/layer[2] = #000001 <<prio=200 from=embedded:4>> conf_rev=15
+ I appearance/color/layer[3] = #000002 <<prio=200 from=embedded:4>> conf_rev=15
+ I appearance/color/layer[4] = #000101 <<prio=400 from=embedded:4>> conf_rev=15
+ I appearance/color/layer[5] = #000102 <<prio=400 from=embedded:4>> conf_rev=15
 === change policy: design->append (0, 1, 2) ===
- I appearance/color/layer[0] = #000001 <<prio=200 from=embedded:4>> conf_rev=24
- I appearance/color/layer[1] = #000002 <<prio=200 from=embedded:4>> conf_rev=24
- I appearance/color/layer[2] = #000101 <<prio=400 from=embedded:4>> conf_rev=24
- I appearance/color/layer[3] = #000102 <<prio=400 from=embedded:4>> conf_rev=24
- I appearance/color/layer[4] = #000201 <<prio=700 from=embedded:4>> conf_rev=24
- I appearance/color/layer[5] = #000201 <<prio=700 from=embedded:4>> conf_rev=24
+ I appearance/color/layer[0] = #000001 <<prio=200 from=embedded:4>> conf_rev=18
+ I appearance/color/layer[1] = #000002 <<prio=200 from=embedded:4>> conf_rev=18
+ I appearance/color/layer[2] = #000101 <<prio=400 from=embedded:4>> conf_rev=18
+ I appearance/color/layer[3] = #000102 <<prio=400 from=embedded:4>> conf_rev=18
+ I appearance/color/layer[4] = #000201 <<prio=700 from=embedded:4>> conf_rev=18
+ I appearance/color/layer[5] = #000201 <<prio=700 from=embedded:4>> conf_rev=18
Index: trunk/tests/conf/tests/arr_set.ref
===================================================================
--- trunk/tests/conf/tests/arr_set.ref	(revision 34791)
+++ trunk/tests/conf/tests/arr_set.ref	(revision 34792)
@@ -1,37 +1,37 @@
 === initial state: empty ===
  I appearance/color/layer[] = <empty>
 === append two items ===
+ I appearance/color/layer[0] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=3
  I appearance/color/layer[0] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
- I appearance/color/layer[0] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=5
- I appearance/color/layer[1] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=5
+ I appearance/color/layer[1] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
 === prepend two items ===
- I appearance/color/layer[0] = #000003 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
- I appearance/color/layer[1] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
- I appearance/color/layer[2] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
- I appearance/color/layer[0] = #000004 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
- I appearance/color/layer[1] = #000003 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
- I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
- I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
+ I appearance/color/layer[0] = #000003 <<prio=700 from=<cmd_reset *>:0>> conf_rev=5
+ I appearance/color/layer[1] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=5
+ I appearance/color/layer[2] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=5
+ I appearance/color/layer[0] = #000004 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
+ I appearance/color/layer[1] = #000003 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
+ I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
+ I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
 === overwrite item ===
+ I appearance/color/layer[0] = #000004 <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
+ I appearance/color/layer[1] = #000005 <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
+ I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
+ I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
+ I appearance/color/layer[0] = #000004 <<prio=700 from=<cmd_reset *>:0>> conf_rev=11
+ I appearance/color/layer[1] = #000005 <<prio=700 from=<cmd_reset *>:0>> conf_rev=11
+ I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=11
+ I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=11
+ I appearance/color/layer[4] = #000006 <<prio=700 from=<cmd_reset *>:0>> conf_rev=11
  I appearance/color/layer[0] = #000004 <<prio=700 from=<cmd_reset *>:0>> conf_rev=12
  I appearance/color/layer[1] = #000005 <<prio=700 from=<cmd_reset *>:0>> conf_rev=12
  I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=12
  I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=12
- I appearance/color/layer[0] = #000004 <<prio=700 from=<cmd_reset *>:0>> conf_rev=13
- I appearance/color/layer[1] = #000005 <<prio=700 from=<cmd_reset *>:0>> conf_rev=13
- I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=13
- I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=13
- I appearance/color/layer[4] = #000006 <<prio=700 from=<cmd_reset *>:0>> conf_rev=13
- I appearance/color/layer[0] = #000004 <<prio=700 from=<cmd_reset *>:0>> conf_rev=14
- I appearance/color/layer[1] = #000005 <<prio=700 from=<cmd_reset *>:0>> conf_rev=14
- I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=14
- I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=14
- I appearance/color/layer[4] = #000006 <<prio=700 from=<cmd_reset *>:0>> conf_rev=14
- I appearance/color/layer[5] =  <<prio=0>> conf_rev=14
- I appearance/color/layer[6] =  <<prio=0>> conf_rev=14
- I appearance/color/layer[7] = #000007 <<prio=700 from=<cmd_reset *>:0>> conf_rev=14
+ I appearance/color/layer[4] = #000006 <<prio=700 from=<cmd_reset *>:0>> conf_rev=12
+ I appearance/color/layer[5] =  <<prio=0>> conf_rev=12
+ I appearance/color/layer[6] =  <<prio=0>> conf_rev=12
+ I appearance/color/layer[7] = #000007 <<prio=700 from=<cmd_reset *>:0>> conf_rev=12
 === overwrite array ===
- I appearance/color/layer[0] = #000008 <<prio=700 from=<cmd_reset *>:0>> conf_rev=19
- I appearance/color/layer[1] = #000003 <<prio=700 from=<cmd_reset *>:0>> conf_rev=19
- I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=19
- I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=19
+ I appearance/color/layer[0] = #000008 <<prio=700 from=<cmd_reset *>:0>> conf_rev=16
+ I appearance/color/layer[1] = #000003 <<prio=700 from=<cmd_reset *>:0>> conf_rev=16
+ I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=16
+ I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=16
Index: trunk/tests/conf/tests/list_merge.ref
===================================================================
--- trunk/tests/conf/tests/list_merge.ref	(revision 34791)
+++ trunk/tests/conf/tests/list_merge.ref	(revision 34792)
@@ -2,12 +2,12 @@
  I rc/library_search_paths = <empty list> <<prio=0>> conf_rev=0
 === import 3 levels ===
 Result: 0
- I rc/library_search_paths = {sys1 <<prio=200 from=embedded:3>>;sys2 <<prio=200 from=embedded:4>>;} <<prio=0>> conf_rev=4
+ I rc/library_search_paths = {sys1 <<prio=200 from=embedded:3>>;sys2 <<prio=200 from=embedded:4>>;} <<prio=0>> conf_rev=3
 Result: 0
- I rc/library_search_paths = {user1 <<prio=400 from=embedded:3>>;user2 <<prio=400 from=embedded:4>>;} <<prio=0>> conf_rev=8
+ I rc/library_search_paths = {user1 <<prio=400 from=embedded:3>>;user2 <<prio=400 from=embedded:4>>;} <<prio=0>> conf_rev=6
 Result: 0
- I rc/library_search_paths = {design1 <<prio=700 from=embedded:3>>;design2 <<prio=700 from=embedded:4>>;} <<prio=0>> conf_rev=12
+ I rc/library_search_paths = {design1 <<prio=700 from=embedded:3>>;design2 <<prio=700 from=embedded:4>>;} <<prio=0>> conf_rev=9
 === change policies ===
- I rc/library_search_paths = {design1 <<prio=700 from=embedded:3>>;design2 <<prio=700 from=embedded:4>>;user1 <<prio=400 from=embedded:3>>;user2 <<prio=400 from=embedded:4>>;} <<prio=0>> conf_rev=16
- I rc/library_search_paths = {design1 <<prio=700 from=embedded:3>>;design2 <<prio=700 from=embedded:4>>;sys1 <<prio=200 from=embedded:3>>;sys2 <<prio=200 from=embedded:4>>;user1 <<prio=400 from=embedded:3>>;user2 <<prio=400 from=embedded:4>>;} <<prio=0>> conf_rev=20
- I rc/library_search_paths = {sys1 <<prio=200 from=embedded:3>>;sys2 <<prio=200 from=embedded:4>>;user1 <<prio=400 from=embedded:3>>;user2 <<prio=400 from=embedded:4>>;design1 <<prio=700 from=embedded:3>>;design2 <<prio=700 from=embedded:4>>;} <<prio=0>> conf_rev=24
+ I rc/library_search_paths = {design1 <<prio=700 from=embedded:3>>;design2 <<prio=700 from=embedded:4>>;user1 <<prio=400 from=embedded:3>>;user2 <<prio=400 from=embedded:4>>;} <<prio=0>> conf_rev=12
+ I rc/library_search_paths = {design1 <<prio=700 from=embedded:3>>;design2 <<prio=700 from=embedded:4>>;sys1 <<prio=200 from=embedded:3>>;sys2 <<prio=200 from=embedded:4>>;user1 <<prio=400 from=embedded:3>>;user2 <<prio=400 from=embedded:4>>;} <<prio=0>> conf_rev=15
+ I rc/library_search_paths = {sys1 <<prio=200 from=embedded:3>>;sys2 <<prio=200 from=embedded:4>>;user1 <<prio=400 from=embedded:3>>;user2 <<prio=400 from=embedded:4>>;design1 <<prio=700 from=embedded:3>>;design2 <<prio=700 from=embedded:4>>;} <<prio=0>> conf_rev=18
Index: trunk/tests/conf/tests/list_set.ref
===================================================================
--- trunk/tests/conf/tests/list_set.ref	(revision 34791)
+++ trunk/tests/conf/tests/list_set.ref	(revision 34792)
@@ -1,10 +1,10 @@
 === initial state: empty ===
  I rc/library_search_paths = <empty list> <<prio=0>> conf_rev=0
 === append two items ===
- I rc/library_search_paths = {foo <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=4
- I rc/library_search_paths = {foo <<prio=700 from=<cmd_reset *>:0>>;bar <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=5
+ I rc/library_search_paths = {foo <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=3
+ I rc/library_search_paths = {foo <<prio=700 from=<cmd_reset *>:0>>;bar <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=4
 === prepend two items ===
- I rc/library_search_paths = {pre1 <<prio=700 from=<cmd_reset *>:0>>;foo <<prio=700 from=<cmd_reset *>:0>>;bar <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=6
- I rc/library_search_paths = {pre2 <<prio=700 from=<cmd_reset *>:0>>;pre1 <<prio=700 from=<cmd_reset *>:0>>;foo <<prio=700 from=<cmd_reset *>:0>>;bar <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=7
+ I rc/library_search_paths = {pre1 <<prio=700 from=<cmd_reset *>:0>>;foo <<prio=700 from=<cmd_reset *>:0>>;bar <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=5
+ I rc/library_search_paths = {pre2 <<prio=700 from=<cmd_reset *>:0>>;pre1 <<prio=700 from=<cmd_reset *>:0>>;foo <<prio=700 from=<cmd_reset *>:0>>;bar <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=6
 === overwrite ===
- I rc/library_search_paths = {new <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=12
+ I rc/library_search_paths = {new <<prio=700 from=<cmd_reset *>:0>>;} <<prio=0>> conf_rev=10