Use of named branches

[Guido Ostkamp]

Hello,

> Here is your second example:
>
> hg glog
>
> o  changeset:   1:9a534b2e2d3b
> |  branch:      seb-dev
> |  tag:         tip
> |  summary:     commit to seb-dev
> |
> @  changeset:   0:f057905ed14e
>   branch:      trunk
>   summary:     commit to trunk
>
> In the second example, it is impossible to merge with trunk, because 
> seb-dev is directly descended from trunk and there is no diverging 
> change.

sorry, but that doesn't sound logical. A file has been added so that the 
working copy is different, and you say, that's no change?

It you like to develop in branches, I think the aforementioned scenario is 
quite a common one.

How do you then get the change back into your mainline (=trunk) branch, if 
not by 'hg merge'?

Regards

Guido