Fwd: [PATCH 1 of 2 V5] update: fix bare --clean to work on new branch (issue5003) (BC)

[Piotr Listkiewicz]

Im resending last message cause there was no answer to it:

We should stick to a consistent behavior. This current patch does not
> 1) if the uncommited branch exists it will update to the head of
> wc.branch()
> 2) if the uncommited branch does not exists it will update to the head of
> p1.branch(),
> We should also pick either p1.branch() (discard before update) or
> wc.branch(discard after update)


Ok, this is dealing issue dealing with 'fix `hg update` with uncommited new
branch change'(without --clean option). So from what i understand if
current branch(working directory branch) exists we should update to the
head of p1.branch(). What about this situation:

o  changeset:   4:8bfba5c70947
|  tag:         tip
|  parent:      2:5b1d7f055b16
|  user:        liscju <piotr.listkiewicz at gmail.com>
|  date:        Fri Mar 18 12:06:09 2016 +0100
|  summary:     f
|
|    o  changeset:   3:16fedbfebd5c
|    |  branch:      dev
|    |  parent:      0:c4d0e2f61fe9
|    |  user:        liscju <piotr.listkiewicz at gmail.com>
|    |  date:        Fri Mar 18 12:01:37 2016 +0100
|    |  summary:     e
|    |
@  |  changeset:   2:5b1d7f055b16
|    |  user:        liscju <piotr.listkiewicz at gmail.com>
|    |  date:        Fri Mar 18 12:00:46 2016 +0100
|    |  summary:     c
|    |
o   |  changeset:   1:e3773bd721b2
|   /   user:        liscju <piotr.listkiewicz at gmail.com>
| /     date:        Fri Mar 18 12:00:32 2016 +0100
|       summary:     b
|
o  changeset:   0:c4d0e2f61fe9
   user:        liscju <piotr.listkiewicz at gmail.com>
   date:        Fri Mar 18 12:00:25 2016 +0100
   summary:     a


We are on the changeset 2 right now, we change branch of working directory
to dev. We run bare 'hg update', current branch exists(dev have head on
revision 3), and 'hg update' will jump to the head of parent branch, so to
the revision 4(on branch default as parent branch) - is this expected
behaviour?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20160401/e9874c73/attachment.html>