pull commit update

[Matt Mackall]

On Wed, Jul 13, 2005 at 11:14:57AM +0400, Dmitriy Nikitinskiy wrote:
> Hello
> 
> I have missunderstand.
> 
> $ hg clone xx xx1
> $ cd xx1
> $ vim file
> $ hg diff
> diff -r 4f0f6710b2a0 file
> --- a/file      Wed Jul 13 07:07:40 2005
> +++ b/file      Wed Jul 13 11:08:18 2005
> @@ -1,3 +1,3 @@
>  1
>  2
> -3
> +4
> $ hg commit -t '2'
> $ cd ../xx
> $ hg pull ../xx1
> $ vim file
> $ hg diff
> diff -r 4f0f6710b2a0 file
> --- a/file      Wed Jul 13 07:07:40 2005
> +++ b/file      Wed Jul 13 11:09:50 2005
> @@ -1,3 +1,3 @@
> -1
> +2
>  2
>  3
> $ hg commit -t 'I think commit must blocked until have unmerged cset in 
> repository'
> $ hg update -m

This updates to the tip, which is what you just committed. The tip is
defined as the most recent commit or the most recent commit of the
most recent pull.

Run 'hg parents' and 'hg heads'.

You can do 'hg update -m <any cset>'. You should have two heads in
your repo now, and the thing you want to merge against is the one
that's not the tip.

-- 
Mathematics is the supreme nostalgia of our time.