Successful push but changes in pushed file are missing
Juliana Arnolds
Juliana.Arnolds at Sun.COM
Thu Oct 2 20:04:56 UTC 2008
Matt Mackall wrote:
> On Thu, 2008-10-02 at 15:12 -0400, Juliana Arnolds wrote:
>
>>Hi,
>>I'm having a problem where changes in my local Mercurial workspace are NOT showing up on the remote
>>Mercurial workspace despite the local commit and subsequent push to the remote Mercurial workspace
>>being successful.
>
>
> Are you familiar with the essential but widely-underappreciated 'hg
> parents' command?
>
> Mercurial never updates the remote working directory on push. There are
> numerous reasons for this:
>
> - someone may be trying to do -work- in that working directory if there
> is one
> - updating is a potentially interactive process which can't be done
> remotely
> - many if not most remote repos have no need of a working directory.
>
Thanks for responding Matt, but I am performing an update of the remote repository when I push from
the local repository by adding the proper hook in the remote repository's hgrc file:
[hooks]
changegroup = hg update >&2
I verified that the remote repository is up-to-date.
After performing "hg parents" on both the remote and local repositories, I see that each has a
different parent (local is at changeset 328 and remote is at changeset 325). We've been keeping
both repositories in sync and performing merges when needed --
I was trying to simplify the situation, but perhaps somehow things are messed up due to subversion
so I'll mention this now. The remote repository was created by importing a subversion repository
from an opensource organization. Since the code space is relatively small, we're using Mercurial on
the remote server as a "staging" area; a place where we push our respective local repository changes
before committing the code back into the opensource SVN repository. We've used hgsvn 0.1.6 scripts
to import the subversion repository and continue to use hgpullsvn to update the remote Hg repository
periodically.
Since I'm still learning about Mercurial, I have no idea what's happened or how to fix it.
More information about the Mercurial
mailing list