Checkout files not in sync with workdir parent !

[Long Vu]

On Tue, Jan 8, 2013 at 5:15 AM, Mads Kiilerich <mads at kiilerich.com> wrote:

> On 01/07/2013 11:11 PM, Long Vu wrote:
>
>> Hi,
>>
>> Here's what happened:
>>
>> # have not pulled for a while
>> hg pull
>> hg update
>> hg cat -r . file1 > file1_from_repo
>> diff file1 file1_from_repo
>> # diff found differences
>>
>
> Which differences?


A diff introduced by the latest cset modifying that file.

I don't remember if that cset came in with the pull or was already in the
local repo (we use shared clone) and I just did not update to a descendant
of that cset yet in my workdir.

This brings different questions:
- is there a way to track when a cset landed in my local repo (both pull or
push, for all csets in a repo).
- is there a way to track the state of a workdir (list of when and what
cset a workdir was updated to, since its creation).

I guess these questions belongs to a different thread.  I will create a new
one.


>
>
>  But hg status and hg diff found nothing !
>>
>> I even tried "hg update --clean ." and it's not better (did not fix the
>> bad checkout file)
>>
>> I ended up deleting the file and let "hg update --clean ." restore the
>> file for me but now I can't reproduce this problem anymore.
>>
>> Has anyone seen this weird behavior before?  This exact same problem also
>> happened to 2 other co-workers.
>>
>> We are using Mercurial 2.2.3, Python 2.6.6 on Linux.
>>
>
>
> Are you using any extensions - such as the eol or keyword extensions?
>

No eol or keyword extensions ("hg showconrfig extensions" did not list
those).


>
> /Mads
>
>
Long

-- 

This email or any attachments may contain confidential or legally 
privileged information intended for the sole use of the addressees. Any 
use, redistribution, disclosure, or reproduction of this information, 
except as intended, is prohibited. If you received this email in error, 
please notify the sender and remove all copies of the message, including 
any attachments.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20130108/d7103ffb/attachment-0002.html>