aborting update spanning branches!

[Goffredo Baroncelli]

On Thursday 28 July 2005 19:22, Matt Mackall wrote:

> 
> The case in question didn't have the linear relation. I should
> probably expand the comment suggesting -m.. How about:
> 
>                 self.ui.status("(use update -m to merge across branches" +
>                                " or -C to lose changes)\n")
> 

Hi Matt,

remember that mercurial is not able to switch directly between two heads, see
my old email http://www.selenic.com/pipermail/mercurial/2005-June/001134.html.
If we want to switch between two different heads in general we have to pass on 
the common anchestor.

# examples repos

#      /---3---4
#  0---
#      \---1---2


$ hg log
changeset:   4:68c358c8dd556822ded622228f8538c1bd8eebc5
tag:         tip
user:        ghigo at therra.bhome
date:        Tue Jun 21 20:07:58 2005
summary:     b updated

changeset:   3:db14c6159342746af31cb059d4b585980aa3bdfe
parent:      0:fad6aeaac6904c098213c791336b813e2a680936
user:        ghigo at therra.bhome
date:        Tue Jun 21 20:07:43 2005
summary:     b updated

changeset:   2:150f604d210fc53dbbb1604aba8fa73f3c334a13
user:        ghigo at therra.bhome
date:        Tue Jun 21 20:08:14 2005
summary:     a updated

changeset:   1:4ad9122623ceabdd5bbb2c404ad6c29dd30f3095
user:        ghigo at therra.bhome
date:        Tue Jun 21 20:08:07 2005
summary:     a updated

changeset:   0:fad6aeaac6904c098213c791336b813e2a680936
user:        ghigo at therra.bhome
date:        Tue Jun 21 20:06:29 2005
summary:     a & b added

$ hg id
68c358c8dd55 tip                # 4
$ hg co 2
this update spans a branch affecting the following files:
 a
aborting update spanning branches!
(use update -m to perform a branch merge)
$ hg co 0
$ hg co 2
$ hg id
150f604d210f                    # 2
$

Goffredo

-- 
gpg key@ keyserver.linux.it: Goffredo Baroncelli (ghigo) <kreijack AT inwind DOT it>
Key fingerprint = CE3C 7E01 6782 30A3 5B87  87C0 BB86 505C 6B2A CFF9