# 
# patch "ChangeLog"
#  from [016732448d020c58a1245727ae00ec66f9533fdb]
#    to [4ca6fa045ed15d09601de1e788e2c2b362d3f5f6]
# 
# patch "commands.cc"
#  from [53c7e0972f1ceaa87973cf276f54ac1f96d7eda3]
#    to [d0e6c37bc5f87889652c17c99c1c78ebd3104195]
# 
========================================================================
--- ChangeLog	016732448d020c58a1245727ae00ec66f9533fdb
+++ ChangeLog	4ca6fa045ed15d09601de1e788e2c2b362d3f5f6
@@ -1,3 +1,8 @@
+2005-10-19  Nathaniel Smith  <address@hidden>
+
+	* commands.cc (update): Make branch sticky even if update target
+	== current rid.
+
 2005-10-19  Matthew A. Nicholson  <address@hidden>
 
 	* std_hooks.lua: Minor correction to vim warning during 3-way merge.
========================================================================
--- commands.cc	53c7e0972f1ceaa87973cf276f54ac1f96d7eda3
+++ commands.cc	d0e6c37bc5f87889652c17c99c1c78ebd3104195
@@ -2935,6 +2935,10 @@
   if (r_old_id == r_chosen_id)
     {
       P(F("already up to date at %s\n") % r_old_id);
+      // do still switch the working copy branch, in case they have used
+      // update to switch branches.
+      if (!app.branch_name().empty())
+        app.make_branch_sticky();
       return;
     }