https://bz.mercurial-scm.org/show_bug.cgi?id=5763
Bug ID: 5763 Summary: Lost file changes in the merge revision Product: Mercurial Version: default branch Hardware: Macintosh OS: Mac OS Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: lke...@gmail.com CC: mercurial-devel@mercurial-scm.org I have branch `default` and `develop`. Add files 3 and 4 on `default` branch, then merge into `develop` (`default` -> `develop`). ***Before commit the merge***, Attempt to use `hg remove -f 4` for remove 4. The status should be like that: A 3 R 4 Then commit it with command `hg commit -m "Merge"`. When I check the changeset again, the MERGE only show me `A 3`, I can not find `R 4` include in that changeset. Reproduce --------- mkdir /tmp/test cd /tmp/test hg init touch 1 2 hg add hg commit -m "Add 1 2" hg branch develop hg commit -m "New branch" hg update default touch 3 4 hg add hg commit -m "Add 3 4" hg update develop hg merge default hg remove -f 4 hg commit -m "Merge" hg status --change tip #The result will only output "A 3" hg log --rev tip --template "{files}" #The result will only output "4" --------- Is that designed by Mercurial or bug ? Any documents can explain this case ? Thanks. -- 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