Use of named branches

[Sebastien Lucas]

On 5/5/07, Guido Ostkamp <hg at ostkamp.fastmail.fm> wrote:
> Hello again,
>
> > 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. I can create my own idea of what should come after trunk:
>
> I just checked with 'git' and it does not have this problem:
>
> $ git init
> Initialized empty Git repository in .git/
> $ touch a.txt
> $ git add a.txt
> $ git commit
> Created initial commit 746ad18: Bla
>   0 files changed, 0 insertions(+), 0 deletions(-)
>   create mode 100644 a.txt
> $ git branch experimental
> $ git checkout experimental
> Switched to branch "experimental"
> $ touch b.txt
> $ git add b.txt
> $ git commit
> Created commit 7b3b99d: Bla2
>   0 files changed, 0 insertions(+), 0 deletions(-)
>   create mode 100644 b.txt
> $ git checkout master
> Switched to branch "master"
> $ git merge experimental
> Updating 746ad18..7b3b99d
>
> Fast forward
> 0 files changed, 0 insertions(+), 0 deletions(-)
>   create mode 100644 b.txt
> $ # Git merge has autocommitted
> $ ls
> a.txt  b.txt
>
> So I think this looks like a bug in Mercurial.
>
> Regards
>
> Guido

That gives me hope for the future .... let's see how it ends.