resolv ed conbflict

git-svn-id: file:///home/lennart/svn/public/syrep/trunk@17 07ea20a6-d2c5-0310-9e02-9ef735347d72

1 files changed, 4 insertions, 1 deletions

diff --git a/src/diff.c b/src/diff.c
index 54185b2..8338be9 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -81,7 +81,6 @@ static int foreach(DB *ddb, struct syrep_db_context *c1, struct syrep_db_context
     if ((md2_valid = get_current_md_by_name(c2, name, &md2)) < 0)
         return -1;
 
-
     //fprintf(stderr, "FOREACH %i %i %s\n", md1_valid, md2_valid, name->path);
         
     if (md1_valid && md2_valid) {
@@ -196,6 +195,8 @@ static int enumerate(DB *ddb, struct syrep_db_context *c1, struct syrep_db_conte
             fprintf(stderr, "foreach() failed\n");
             goto finish;
         }
+
+        rotdash();
     }
 
 
@@ -234,6 +235,8 @@ DB* make_diff(struct syrep_db_context *c1, struct syrep_db_context *c2) {
     if (enumerate(ddb, c2, c1) < 0)
         goto finish;
 
+    rotdash_hide();
+    
     return ddb;
     
 finish: