hg 0.9.3: pull, revert to pre-merged version, pull expected behavior?

[Matt Mackall]

On Thu, Apr 26, 2007 at 08:43:05AM -0400, Allan Wind wrote:
> On 2007-04-26T00:23:04-0500, Matt Mackall wrote:
> > On Thu, Apr 26, 2007 at 12:58:07AM -0400, Allan Wind wrote:
> > > If I try to pull it in again I get a different behavior than the first
> > > time around:
> > > 
> > > $ hg pull ../my-hello-new-output
> > > pulling from ../my-hello-new-output
> > > searching for changes
> > > no changes found
> > > 
> > > Is that expected behavior?
> > 
> > Yes. You seem to be confused about what pull does, please see:
> > 
> > http://www.selenic.com/mercurial/wiki/index.cgi/UnderstandingMercurial
> 
> So if I cannot pull the changes in (because they were already merged
> into this branch), then how do I get those changes?  diff/patch?

You're still not Understanding Mercurial.

A repository is a collection of changesets, usually coupled with a
working directory. Push and pull syncronize changesets between
repositories with -no effect on your working directory-. So when you
did the first pull, you got all those changesets into your local
repository. You can see them with hg log and hg heads. There's no need
to pull them again.

Merge brings changes from other parts of the repository into your
working directory with -no effect on your repository-.

-- 
Mathematics is the supreme nostalgia of our time.