Mercurial central server file discrepancy (using 'diff to local')

Posted by David Montgomery on Stack Overflow See other posts from Stack Overflow or by David Montgomery
Published on 2010-05-04T19:05:12Z Indexed on 2010/05/04 19:08 UTC
Read the original article Hit count: 304

Filed under:

Newbie alert!

OK, I have a working central Mercurial repository that I've been working with for several weeks.

Everything has been great until I hit a really bizarre problem: my central server doesn't seem to be synced to itself? I only have one file that seems to be out-of-sync right now, but I really need to know how this happened to prevent it from happening in the future.

Scenario:

1) created Mercurial repository on server using an existing project directory. The directory contained the file 'mypage.aspx'.

2) On my workstation, I cloned the central repository

3) I made an edit to mypage.aspx

4) hg commit, then hg push from my workstation to the central server

5) now if I look at mypage.aspx on the server's repository using TortoiseHg's repository explorer, I see the change history for mypage.aspx -- an initial check-in and one edit. However, when I select 'Diff to local', it shows the current version on the server's disk is the original version, not the edited version!

I have not experimented with branching at all yet, so I'm sure I'm not getting a branch problem.

'hg status' on the server or client returns no pending changes.

If I create a clone of the server's repository to a new location, I see the same change history as I would expect, but the file on disk doesn't contain my edit.

So, to recap:

Central repository = original file, but shows change in revision history (bad)

Local repository 'A' = updated file, shows change in revision history (good)

Local repository 'B' = original file, but shows change in revision history (bad)

Help please!

Thanks,

David

© Stack Overflow or respective owner

Related posts about mercurial