[Monotone-devel] multiple candidates remain after selection

[Derek Scherger]

What's the correct way to get past this problem when doing an update? At the moment all of 
my work-in-progress trees don't want to update and give me the following message:

$ monotone update
monotone: chosen target 558a3c19ba0120e79ddd7d405c04420f304265bb
monotone: chosen target 94e7e962ed16b7c2c92246632ce0fbc3d96d3b8b
monotone: misuse: multiple candidates remain after selection
$

I added the chosen target message a while ago when I first encountered this. I haven't 
updated from graydon's tree for a week or so and now it appears I can't.

Thanks for any help.

Cheers,
Derek

Here's the patch I'm using to list the targets:

--- update.cc
+++ update.cc
@@ -154,6 +154,15 @@
   find_deepest_acceptable_descendent(base_ident, cert_value(app.branch_name()),
                                     app, chosen_set);

+  if (chosen_set.size() > 1)
+    {
+      for (set<manifest_id>::const_iterator i = chosen_set.begin();
+          i != chosen_set.end(); ++i)
+       {
+         P(F("chosen target %s\n") % i->inner()());
+       }
+    }
+
   N(chosen_set.size() != 0,
     F("no candidates remain after selection"));