AW: Re: Largefiles Issue on Update

[Matt Harbison]

On Wed, 12 Dec 2012 10:27:35 +0000, Kämpf, Andreas (SMS Siemag AG) wrote:

> Matt,
> 
> Thanks for your reply.
> 
> Using a clean update was my first try. The second approach I tried was
> to make a clean update of an older rev in which the .ppt had not been
> added yet. This worked, but I was not able to (clean) update to any rev
> with the largefile.
> 
> I can confirm that the .hglf/doc/04.MSC-Mill Level
> 2/04.07.Training/04.07.01.PCFC Training.ppt.orig was there when I
> reported this issue.
> 
> Maybe hg was not able to move it out of the way?

It's not trying to though.  It sees this file, and decides that it needs 
to move the corresponding 'largefile' to 'largefile.orig', but 'largefile' 
doesn't exist.  I'm hesitant to just fix that, because it seems there's a 
bad assumption being made somewhere, and making this change will obscure 
that.  This area of code hasn't changed since largefiles was added to hg, 
so I'm not sure how this code evolved.

I looked at the code the other day (I may be forgetting a few cases now) 
and it looked like the .orig files are only made in a few cases, like 
revert, resolve and some merges.  Do you remember doing any of these 
things?  Do you remember any of the steps on the local repo leading up to 
the error?  It would be useful to boil this down to the simplest 
reproducible case.
 
> My colleague made a new clone from the whole repo, but has a copy of the
> old defective subrepo. I just checked and realized that after some more
> trials he did both files are present as you suggested.
> 
> So if it would be any benefit I could try some new ideas on the old
> subrepo.

I can't think of anything offhand, but it might be useful to keep around 
to confirm any fix that might come out of this.

--Matt