# 
# 
# patch "ChangeLog"
#  from [59e551fe49d1b0f55a63101f2db89c04c515cdf3]
#    to [b3c858995b5a3059cd2e54adc2cd6acf22f70994]
# 
# patch "cmd_diff_log.cc"
#  from [16d97c17172f5c0ce446767d513daf6b3c18995b]
#    to [0eee6f1675c850932e53b7a0214235ae0dc65ad4]
# 
# patch "revision.cc"
#  from [c40336d7a3a9a107e1a6820ec1cc3906254a76ab]
#    to [94fd29b8e5b12a4926b7c0c444838d17414c5576]
# 
============================================================
--- ChangeLog	59e551fe49d1b0f55a63101f2db89c04c515cdf3
+++ ChangeLog	b3c858995b5a3059cd2e54adc2cd6acf22f70994
@@ -1,3 +1,9 @@
+2006-11-13  Thomas Moschny  <address@hidden>
+
+	* cmd_diff_log.cc (CMD(log)): Fix-ups from last propagate nvm ->
+	nvm.heights.
+	* revision.cc (CMD(rev_height)): dito.
+
 2006-11-11  Thomas Moschny  <address@hidden>
 
 	* rev_height.hh, rev_height.cc: remove the dump method, add an
============================================================
--- cmd_diff_log.cc	16d97c17172f5c0ce446767d513daf6b3c18995b
+++ cmd_diff_log.cc	0eee6f1675c850932e53b7a0214235ae0dc65ad4
@@ -565,10 +565,10 @@ CMD(log, N_("informative"), N_("[FILE] .
   if (app.opts.revision_selectors.size() == 0)
     app.require_workspace("try passing a --revision to start at");
 
-  long last = app.last;
-  long next = app.next;
+  long last = app.opts.last;
+  long next = app.opts.next;
 
-  N(app.last == -1 || app.next == -1,
+  N(last == -1 || next == -1,
     F("only one of --last/--next allowed"));
 
   frontier_t frontier(rev_cmp(!(next>0)));
@@ -708,12 +708,12 @@ CMD(log, N_("informative"), N_("[FILE] .
             }
         }
 
-      if (app.no_merges && rev.is_merge_node())
+      if (app.opts.no_merges && rev.is_merge_node())
         print_this = false;
       
       if (print_this)
         {
-          if (app.brief)
+          if (app.opts.brief)
             {
               cout << rid;
               log_certs(app, rid, author_name);
@@ -747,7 +747,7 @@ CMD(log, N_("informative"), N_("[FILE] .
               log_certs(app, rid, branch_name, "Branch: ", false);
               log_certs(app, rid, tag_name,    "Tag: ",    false);
 
-              if (!app.no_files && !csum.cs.empty())
+              if (!app.opts.no_files && !csum.cs.empty())
                 {
                   cout << "\n";
                   csum.print(cout, 70);
@@ -758,7 +758,7 @@ CMD(log, N_("informative"), N_("[FILE] .
               log_certs(app, rid, comment_name,   "Comments: ",  true);
             }
 
-          if (app.diffs)
+          if (app.opts.diffs)
             {
               for (edge_map::const_iterator e = rev.edges.begin();
                    e != rev.edges.end(); ++e)
============================================================
--- revision.cc	c40336d7a3a9a107e1a6820ec1cc3906254a76ab
+++ revision.cc	94fd29b8e5b12a4926b7c0c444838d17414c5576
@@ -1697,7 +1697,7 @@ CMD(rev_height, hidden_group(), N_("REV"
 }
 
 CMD(rev_height, hidden_group(), N_("REV"), "show the height for REV",
-    option::none)
+    options::opts::none)
 {
   if (args.size() != 1)
     throw usage(name);