Successful push but changes in pushed file are missing

[Matt Mackall]

On Thu, 2008-10-02 at 16:16 -0400, Juliana Arnolds wrote:
> Benoit Boissinot wrote:
> > On Thu, Oct 2, 2008 at 9:35 PM, Juliana Arnolds <Juliana.Arnolds at sun.com> wrote:
> > 
> >>Peter Hosey wrote:
> >>
> >>>On Oct 02, 2008, at 12:12:01, Juliana Arnolds wrote:
> >>>
> >>>What does "hg parents" say in each repository?
> >>
> >>Uh oh....the "hg parents" output is different for the local and the remote repositories....when I
> >>perform an "hg log" on both repositories, the logs are the same.  I'm relatively new to Mercurial so
> >> I'll have to read about this --
> >>
> >>
> >>>Have you run hg update on the remote repository?
> >>
> >>Yes -- states that the repository is up-to-date and the head for the remote repository matches the
> >>head for the local one.
> >>
> > 
> > Are branches involved ? do you use the same hg version on both sides ?
> 
> Both the local and the remote repositories are using the same Mercurial version, 1.0.  As far as 
> branches are concerned, I believe we are dealing with branches since there are two repositories that 
> were cloned from the same remote repository.  According to the write-up about branches 
> (http://www.selenic.com/mercurial/wiki/index.cgi/Branch), it states:

Benoit's specifically talking about so-called 'named branches' that show
as "branch: foo" in the log. The default branch name (not shown) is
'default'.

Update with no arguments takes you to the tip-most branch on the same
named branch as your working directory. Thus, if your tip is on a branch
with a different name than the one in your working directory, you won't
end up at tip after update.

-- 
Mathematics is the supreme nostalgia of our time.