A tale of user-friendliness with "hg merge" and "hg rollback".

[Rob Landley]

On Monday 12 October 2009 16:59:09 Adrian Buehlmann wrote:
> On 12.10.2009 23:23, Rob Landley wrote:
> > Nor why it tries so hard to involve the current
> > working store in pulling somebody else's repository.
>
> I'll pick out this sentence to comment on.
>
> "The current working store"
>
> This term is a hint that you probably have some misunderstanding
> of what a repository is and what the Mercurial's working directory is.
>
> There is no such thing as a "working store" (although I'm wondering
> if you might mean a clone here?).

I mean the checked out files outside the .hg directory.  I'm not quite sure the 
correct term for it, I've heard working tree, working store, working 
directory...

> If I may suggest to verify that your understanding of the following
> two basic terms is in line with the respective wiki pages:
>
> http://mercurial.selenic.com/wiki/Repository
> http://mercurial.selenic.com/wiki/WorkingDirectory

Ok.

> Further important concepts are:
>
> http://mercurial.selenic.com/wiki/Parent
> http://mercurial.selenic.com/wiki/Tip

Those I know, thanks.

> For a basic understanding see:
>
> http://mercurial.selenic.com/wiki/UnderstandingMercurial

I have been using mercurial for three years now, and I'm reading the red book 
that Matt pointed me at to see what's new.  I've just been using "hg export" 
and "hg import" to cherry pick stuff up until now.  I wouldn't have posted 
about just this, I was actually confused by the "repository suddenly went 
away" thing due to rollback undoing clone.  (I was interrupted between the 
clone and the rollback, and hadn't noticed that was the directory I'd done it 
in, or I'd probably have put 2+2 together faster despite this cold.)

My bad.

Rob
-- 
Latency is more important than throughput. It's that simple. - Linus Torvalds