#
#
# patch "lib/perl/Common.pm"
#  from [f518860a5ef672eb6eede246df1250cd76e5287d]
#    to [33b20690eec1b473b319b4d1cd1d76c14ed75ed6]
# 
# patch "lib/perl/History.pm"
#  from [1eabcf9989ba60ef2ae9401af5cf6cdb88c0ee22]
#    to [89afe8aae1a4b16a8ac2ebc7a31c7f4f8f27b504]
#
============================================================
--- lib/perl/Common.pm	f518860a5ef672eb6eede246df1250cd76e5287d
+++ lib/perl/Common.pm	33b20690eec1b473b319b4d1cd1d76c14ed75ed6
@@ -1155,6 +1155,11 @@ sub get_file_details($$$$$$)
        @revision_list);
 
     $mtn->get_content_changed(address@hidden, $revision_id, $file_name);
+    if (scalar(@revision_list) > 1)
+    {
+	$mtn->toposort(address@hidden, @revision_list);
+	@revision_list = reverse(@revision_list);
+    }
     $$last_changed_revision = $revision_list[0];
     $mtn->certs(address@hidden, $revision_list[0]);
     $$author = $$last_update = "";
============================================================
--- lib/perl/History.pm	1eabcf9989ba60ef2ae9401af5cf6cdb88c0ee22
+++ lib/perl/History.pm	89afe8aae1a4b16a8ac2ebc7a31c7f4f8f27b504
@@ -570,11 +570,22 @@ sub display_revision_comparison($$$;$)
 
     $instance->{appbar}->set_status(__("Calculating differences"));
     $wm->update_gui();
-    mtn_diff($instance->{diff_output},
-	     $mtn->get_db_name(),
-	     $revision_id_1,
-	     $revision_id_2,
-	     $file_name);
+    if ($mtn->supports(MTN_CONTENT_DIFF_EXTRA_OPTIONS))
+    {
+	$mtn->content_diff($instance->{diff_output},
+			   ["with-header"],
+			   $revision_id_1,
+			   $revision_id_2,
+			   $file_name);
+    }
+    else
+    {
+	mtn_diff($instance->{diff_output},
+		 $mtn->get_db_name(),
+		 $revision_id_1,
+		 $revision_id_2,
+		 $file_name);
+    }
 
     $instance->{stop_button}->set_sensitive(TRUE);
 
@@ -937,7 +948,7 @@ sub display_revision_comparison($$$;$)
 
     # Move to the file if a file comparison is being done.
 
-    if (defined($file_name))
+    if (defined($file_name) && scalar(@files) > 0)
     {
 
 	# Simply let the combobox's change callback fire after setting its