#
#
# patch "ChangeLog"
#  from [cf00f50cce62e09be350cf89fbde710e57282067]
#    to [4871c280d1e63876b8646bb13b51772a5d5e8957]
# 
# patch "commands.cc"
#  from [ceb664c7a28ffeb45f83ea18b7a4e481ad9878b0]
#    to [078af1ff18bca4436719058c30add8b0fed50d4e]
#
============================================================
--- ChangeLog	cf00f50cce62e09be350cf89fbde710e57282067
+++ ChangeLog	4871c280d1e63876b8646bb13b51772a5d5e8957
@@ -1,5 +1,9 @@ 2006-02-24  Richard Levitte  <address@hidden
 2006-02-24  Richard Levitte  <address@hidden>
 
+	* commands.cc (complete): Correct a small merge error.
+
+2006-02-24  Richard Levitte  <address@hidden>
+
 	* commands.cc (ls_changed): I was a bit overly paranoid about the
 	possibilities with C++ and defined an explicit functor for the set
 	instead of relying on the automatic generation of less<file_path>.
============================================================
--- commands.cc	ceb664c7a28ffeb45f83ea18b7a4e481ad9878b0
+++ commands.cc	078af1ff18bca4436719058c30add8b0fed50d4e
@@ -510,10 +510,10 @@ complete(app_state & app, 
       erase_ancestors(completions, app);
     }
 
-  for (set<string>::const_iterator i = completions.begin();
+  for (set<revision_id>::const_iterator i = completions.begin();
        i != completions.end(); ++i)
     {
-      pair<set<revision_id>::const_iterator, bool> p = completion.insert(revision_id(*i));
+      pair<set<revision_id>::const_iterator, bool> p = completion.insert(*i);
       P(F("expanded to '%s'\n") % *(p.first));
     }
 }