https://bz.mercurial-scm.org/show_bug.cgi?id=6531
Bug ID: 6531
Summary: Working directory has uncommitted changes after merge
Product: Mercurial
Version: 5.8
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: aklitz...@gmail.com
CC: mercurial-devel@mercurial-scm.org
Python Version: ---
Created attachment 2116
--> https://bz.mercurial-scm.org/attachment.cgi?id=2116&action=edit
Example data to reproduce
We found a strange bug on a merge commit. If someone merge changes of a moved
file it will show uncommitted changes after applying the bundle or pulling it
from repository. It is necessary to pull/unbundle those changeset. If you
commit that changeset it will work. Stripping and unbundling it introduces it,
too.
Steps to reproduce von Mercurial 5.8
1. hg init example
2. cd example
3. hg unbundle ../init.hg
4. hg unbundle ../merge.hg
5. hg update
6. hg status
It will show "M new/Test.cpp". Even "hg update -C" won't clear this.
Best regards
André
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
