#
#
# patch "lib/perl/AdvancedFind.pm"
#  from [e63ad4c95c1f2ad8b150c5649dbc6312212e5bb1]
#    to [cdff0ecee46a675534e59e16dd909f595e0c4680]
# 
# patch "lib/perl/History.pm"
#  from [bdbf863e5c864f88bd20fe4f010749a417c86c30]
#    to [0429cad939f23bed90ff4f8c7618d96c7545efe2]
# 
# patch "lib/ui/mtn-browse.glade"
#  from [d7121c126af68f4d1b31d55898d745be52e4711b]
#    to [63c5b2fec95fadae114228db9f47d780387a4c56]
# 
# patch "locale/help/C/mtn-browse.xml"
#  from [1fc3a0ba4f443567644ce91a34a60bd7e7d0b92a]
#    to [f952b71fc9441d79aa993a918925b7eedddf6451]
#
============================================================
--- lib/perl/AdvancedFind.pm	e63ad4c95c1f2ad8b150c5649dbc6312212e5bb1
+++ lib/perl/AdvancedFind.pm	cdff0ecee46a675534e59e16dd909f595e0c4680
@@ -334,13 +334,13 @@ sub populate_button_clicked_cb($$)
     {
 	$to_insert = "i:" . (($arg eq "") ? __("<Revision Id>") : $arg);
     }
-    elsif ($selector eq __("Parent"))
+    elsif ($selector eq __("Logical And"))
     {
-	$to_insert = "p:" . (($arg eq "") ? __("<Revision Id>") : $arg);
+	$to_insert = "/";
     }
-    elsif ($selector eq __("Separator"))
+    elsif ($selector eq __("Parent"))
     {
-	$to_insert = "/";
+	$to_insert = "p:" . (($arg eq "") ? __("<Revision Id>") : $arg);
     }
     elsif ($selector eq __("Tag"))
     {
@@ -381,6 +381,7 @@ sub term_combobox_changed_cb($$)
     local $advanced_find->{in_cb} = 1;
 
     my($arg,
+       $date,
        $pos,
        $selector,
        $time_val,
@@ -391,13 +392,13 @@ sub term_combobox_changed_cb($$)
 
     $selector = $advanced_find->{term_combobox}->get_model()->get
 	($advanced_find->{term_combobox}->get_active_iter(), 0);
-
-    if ($selector =~ m/^Date .*$/)
+    $date = __("Date");
+    if ($selector =~ m/^${date} .*$/)
     {
 	$advanced_find->{argument_entry}->set_sensitive(FALSE);
 	$advanced_find->{date_dateedit}->set_sensitive(TRUE);
     }
-    elsif ($selector eq __("Separator"))
+    elsif ($selector eq __("Logical And"))
     {
 	$advanced_find->{argument_entry}->set_sensitive(FALSE);
 	$advanced_find->{date_dateedit}->set_sensitive(FALSE);
============================================================
--- lib/perl/History.pm	bdbf863e5c864f88bd20fe4f010749a417c86c30
+++ lib/perl/History.pm	0429cad939f23bed90ff4f8c7618d96c7545efe2
@@ -917,28 +917,35 @@ sub display_revision_comparison($$$;$)
 	}
 	++ $i;
     }
+    $instance->{file_comparison_combobox}->set_active(0);
     $instance->{appbar}->set_progress_percentage(1);
+
+    # Make sure we are at the top.
+
+    $instance->{comparison_buffer}->
+	place_cursor($instance->{comparison_buffer}->get_start_iter());
+    $instance->{comparison_scrolledwindow}->get_vadjustment()->set_value(0);
+    $instance->{comparison_scrolledwindow}->get_hadjustment()->set_value(0);
     $wm->update_gui();
+
+    # Move to the file if a file comparison is being done.
+
     if (defined($file_name))
     {
+
+	# Simply let the combobox's change callback fire after setting its
+	# value.
+
+	local $instance->{in_cb} = 0;
 	$instance->{file_comparison_combobox}->set_active(1);
-	$instance->{external_diffs_button}->set_sensitive(TRUE);
+	$wm->update_gui();
+
     }
-    else
-    {
-	$instance->{file_comparison_combobox}->set_active(0);
-    }
+
     $instance->{appbar}->set_progress_percentage(0);
     $instance->{appbar}->set_status("");
     $wm->update_gui();
 
-    # Make sure we are at the top.
-
-    $instance->{comparison_buffer}->
-	place_cursor($instance->{comparison_buffer}->get_start_iter());
-    $instance->{comparison_scrolledwindow}->get_vadjustment()->set_value(0);
-    $instance->{comparison_scrolledwindow}->get_hadjustment()->set_value(0);
-
     $instance->{appbar}->pop();
     $wm->make_busy($instance, 0);
 
============================================================
--- lib/ui/mtn-browse.glade	d7121c126af68f4d1b31d55898d745be52e4711b
+++ lib/ui/mtn-browse.glade	63c5b2fec95fadae114228db9f47d780387a4c56
@@ -1015,8 +1015,8 @@ or more search criteria</property>
 					  <property name="visible">True</property>
 					  <property name="width">1</property>
 					  <property name="height">1</property>
-					  <property name="hadjustment">0 0 118 10 106.199996948 118</property>
-					  <property name="vadjustment">0 0 17 10 15.3000001907 17</property>
+					  <property name="hadjustment">0 0 118 10 106.2 118</property>
+					  <property name="vadjustment">0 0 17 10 15.3 17</property>
 
 					  <child>
 					    <widget class="GtkEventBox" id="file_name_value_label_eventbox">
@@ -1076,8 +1076,8 @@ or more search criteria</property>
 					  <property name="visible">True</property>
 					  <property name="width">1</property>
 					  <property name="height">1</property>
-					  <property name="hadjustment">0 0 118 10 106.199996948 118</property>
-					  <property name="vadjustment">0 0 17 10 15.3000001907 17</property>
+					  <property name="hadjustment">0 0 118 10 106.2 118</property>
+					  <property name="vadjustment">0 0 17 10 15.3 17</property>
 
 					  <child>
 					    <widget class="GtkEventBox" id="last_update_value_label_eventbox">
@@ -1220,8 +1220,8 @@ updated with respect to this revision</p
 					  <property name="visible">True</property>
 					  <property name="width">1</property>
 					  <property name="height">1</property>
-					  <property name="hadjustment">0 0 122 10 109.800003052 122</property>
-					  <property name="vadjustment">0 0 17 10 15.3000001907 17</property>
+					  <property name="hadjustment">0 0 122 10 109.8 122</property>
+					  <property name="vadjustment">0 0 17 10 15.3 17</property>
 
 					  <child>
 					    <widget class="GtkEventBox" id="file_author_value_label_eventbox">
@@ -1281,8 +1281,8 @@ updated with respect to this revision</p
 					  <property name="visible">True</property>
 					  <property name="width">1</property>
 					  <property name="height">1</property>
-					  <property name="hadjustment">0 0 122 10 109.800003052 122</property>
-					  <property name="vadjustment">0 0 17 10 15.3000001907 17</property>
+					  <property name="hadjustment">0 0 122 10 109.8 122</property>
+					  <property name="vadjustment">0 0 17 10 15.3 17</property>
 
 					  <child>
 					    <widget class="GtkEventBox" id="file_revision_id_value_label_eventbox">
@@ -2700,8 +2700,8 @@ Identifier
 Date (&gt;)
 Head Revision
 Identifier
+Logical And
 Parent
-Separator
 Tag</property>
 				  <signal name="changed" handler="term_combobox_changed_cb" last_modification_time="Sat, 19 Jan 2008 16:11:23 GMT"/>
 				</widget>
============================================================
--- locale/help/C/mtn-browse.xml	1fc3a0ba4f443567644ce91a34a60bd7e7d0b92a
+++ locale/help/C/mtn-browse.xml	f952b71fc9441d79aa993a918925b7eedddf6451
@@ -744,10 +744,10 @@ GNOME or DocBook.
               <para><guilabel>Identifier</guilabel> - This selector allows one to select revisions based upon their revision id. This is Monotone's <literal>i:</literal> selector. It takes one parameter, the id of a revision, in the form of a hexadecimal string. The revision id need not be complete.</para>
             </listitem>
             <listitem>
-              <para><guilabel>Parent</guilabel> - This selector allows one to select revisions that are parents of the specified revision id. This is Monotone's <literal>p:</literal> selector. It takes one parameter, the id of a revision, in the form of a hexadecimal string. The revision id need not be complete.</para>
+              <para><guilabel>Logical And</guilabel> - This is a logical AND operator. Currently Monotone does not directly support an OR operator. This is Monotone's <literal>/</literal> selector operator. It takes no parameters but instead combines two other selectors together.</para>
             </listitem>
             <listitem>
-              <para><guilabel>Separator</guilabel> - This is actually a logical AND operator. Currently Monotone does not directly support an OR operator. This is Monotone's <literal>/</literal> selector operator. It takes no parameters but rather combines to other selectors together.</para>
+              <para><guilabel>Parent</guilabel> - This selector allows one to select revisions that are parents of the specified revision id. This is Monotone's <literal>p:</literal> selector. It takes one parameter, the id of a revision, in the form of a hexadecimal string. The revision id need not be complete.</para>
             </listitem>
             <listitem>
               <para><guilabel>Tag</guilabel> - This selector allows one to select revisions based upon whether they are tagged with a particular tag. This is Monotone's <literal>t:</literal> selector. It takes one parameter, the name of a tag.</para>
@@ -791,7 +791,7 @@ GNOME or DocBook.
             <para>Left click on the <inlinegraphic fileref="figures/up-button-small.png" format="png" valign="middle"/>&nbsp; button to insert that selector term into the <guilabel>Search term</guilabel> combobox entry field.</para>
           </listitem>
           <listitem>
-            <para>Select <guilabel>Separator</guilabel> in the selector term combobox.</para>
+            <para>Select <guilabel>Logical And</guilabel> in the selector term combobox.</para>
           </listitem>
           <listitem>
             <para>Left click on the <inlinegraphic fileref="figures/up-button-small.png" format="png" valign="middle"/>&nbsp; button to insert that selector term into the <guilabel>Search term</guilabel> combobox entry field.</para>