Fix file tree merging (broken since 7b26d6b3)
authorDan Winship <danw@gnome.org>
Tue Mar 11 17:15:02 2008 -0400 (2008-03-11)
changeset 164ed154b422dc0
parent 163 978c98ddb8aa
child 165 bf7c5b2484e3
Fix file tree merging (broken since 7b26d6b3)
razor.c
     1.1 --- a/razor.c	Tue Mar 11 16:48:20 2008 -0400
     1.2 +++ b/razor.c	Tue Mar 11 17:15:02 2008 -0400
     1.3 @@ -1608,7 +1608,9 @@
     1.4  	map1 = merger->source1.file_map;
     1.5  	map2 = merger->source2.file_map;
     1.6  
     1.7 -	md.merged = add_file(merger, "");
     1.8 +	md.merged = 0;
     1.9 +	root = (struct razor_entry *) merger->set->files.data;
    1.10 +	root->name = hashtable_tokenize(&merger->table, "");
    1.11  
    1.12  	if (merger->source1.set->files.size) {
    1.13  		root = (struct razor_entry *) merger->source1.set->files.data;