[issue417] Merge with uncommitted changes puts branch in broken state

[Benoit Boissinot]

On 11/10/06, Ryan Daum <mercurial-bugs at selenic.com> wrote:
>
> New submission from Ryan Daum <rdaum at informiam.com>:
>
> Using a repository here at work, using Hg 0.9.1 on Linux:
>
> yevgeny at ys:~/dev/ea.baseline$ hg pull
> pulling from /home/yevgeny/mnt/shared_drive/dev/hg_repository/ea/ea.baseline
> searching for changes
> adding changesets
> adding manifests
> adding file changes
> added 29 changesets with 744 changes to 661 files (+2 heads)
> (run 'hg heads' to see heads, 'hg merge' to merge)
> yevgeny at ys:~/dev/ea.baseline$ hg merge
> abort: outstanding uncommitted changes
> yevgeny at ys:~/dev/ea.baseline$ cd ..
> yevgeny at ys:~/dev$ cp -r ea.baseline ea.baseline.bak
> cd eayevgeny at ys:~/dev$ cd ea.baseline
> yevgeny at ys:~/dev/ea.baseline$ hg commit -m "Y's changes"
> yevgeny at ys:~/dev/ea.baseline$ hg merge
> abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'

Here tip is the newly commited changeset, hg tries to merge to tip,
but you already are there.
Look at 'hg heads' what the other head is and do
$ hg merge <other_head>

I think it got 'fixed' later (if there is another head, it will merge
to it even if the other isn't tip)

regards,

Benoit