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

Ryan Daum mercurial-bugs at selenic.com
Fri Nov 10 10:19:21 CST 2006


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'
yevgeny at ys:~/dev/ea.baseline$ hg pull
pulling from /home/yevgeny/mnt/shared_drive/dev/hg_repository/ea/ea.baseline
searching for changes
no changes found

The changes from upstream are lost.  Subsequent attempts to pull changes from
the same repository show no changes.  The branch ends up in a state where you
can no longer pull from upstream.

This happens consistently for us if you do a commit or revert of uncommitted
changes after the merge.

I have been unable so far to create a test case to replicate this problem with a
brand new repository, but it happens consistently with our repository.

I will continue trying to create a repeatable test case for this.

----------
messages: 2342
nosy: rdaum
priority: critical
status: unread
title: Merge with uncommitted changes puts branch in broken state

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue417>
____________________________________________________



More information about the Mercurial-devel mailing list