Re: [Monotone-devel] Re: 0.26 error

[Nathaniel Smith]

On Thu, Jun 08, 2006 at 07:40:23AM -0400, Shawn Samuel wrote:
> Nathaniel,
> 
> Multiple developers on my team are hitting this, and at least myself
> and one other person are seeing this when no files are being
> changed and no other activity is happening in the working tree.
> 
> Are fixes like these done on their own branches? i.e. I would like to
> be able to build a monotone 0.26+ with just this patch as one of my
> developers seems to be hitting it on every update right now.

Well, here's a minimal patch against 0.26 (untested, but dead simple):

--- work.cc     b4e65a058f65062894d119f77e9ab0866b05a4c5
+++ work.cc     7880412b85010f0d55baf15f5c32077e3115c15e
@@ -999,7 +999,7 @@
   calculate_ident(pth_unsplit, curr_id_raw, app.lua);
   file_id curr_id(curr_id_raw);
   E(curr_id == old_id,
-    F("content of file '%s' has changed, not overwriting"));
+    F("content of file '%s' has changed, not overwriting") % pth_unsplit);
   P(F("updating %s") % pth_unsplit);
 
   file_data dat;

It won't solve your problem on its own, since the bug you are hitting
is itself in the error-reporting logic -- so with the bug fixed you'll
just get a more useful error message :-).  But that might hint at
what's actually going wrong, since it will tell you what path is
causing the problem.

My guess is that like Tim said, it's some sort of issue with the
doppelganger files you reported earlier.  If so, your history is
intact and everything, it's just that current versions of monotone
aren't very clever about handling it on case-insensitive filesystems;
so if you can just clean it up and get past it (e.g. by using checkout
instead of update, or cleaning it up and then updating to a cleaned
up revision might work?), then you should be fine until we have a more
proper fix.  Sorry for the inconvenience!

Let us know if that helps at all; hard to give more specific advice
without knowing more details of the problem.

-- Nathaniel

-- 
"...these, like all words, have single, decontextualized meanings: everyone
knows what each of these words means, everyone knows what constitutes an
instance of each of their referents.  Language is fixed.  Meaning is
certain.  Santa Claus comes down the chimney at midnight on December 24."
  -- The Language War, Robin Lakoff