Revision Details incorrectly shows 'added' for merge revisions
Created originally on Bitbucket by bels (Stephen Belknap)
When viewing merge revisions in the Workbench's Revision Details area, I noticed that the '(was added)' is not always accurate. For example, consider the following test case (Windows):
{{{ mkdir c:\temp cd c:\temp rmdir /s /q file-track-test hg init file-track-test cd file-track-test REM creating a foo.txt, modifying it, then deleting it echo foo > foo.txt hg addrem hg commit -m "foo.txt: added" echo foo-foo >> foo.txt hg commit -m "foo.txt: modified" del foo.txt hg addrem hg commit -m "foo.txt: deleted" REM update before delete, modify foo.txt and merge hg update -r 1 echo foo-prior-to-delete >> foo.txt hg commit -m "foo.txt: added to it in another 'branch'" hg update -r 2 REM the 'c' here is for accepting the (c)hanged REM foo.txt, and not the (d)eleted one hg merge -r 3 c hg commit -m "merge, but re-introduced foo.txt" thg log }}}
- Be sure the Revision Details for Rev 4 is selected
- Click the Show All
- Notice it says foo.txt (was added) for both '1' and '2'
This is not correct since it was only added for Parent1. Parent2 already had it.
Also, why is Show All needed? The file was modified so shouldn't it show up in the list of modified files? I don't understand the distinction between the files shown by default vs. the files shown when Show All is selected.
{{{ TortoiseHg version 2.1.3 with Mercurial-1.9.2, Python-2.6.6, PyQt-4.8.3, Qt-4.7.1 }}}
Thanks for the help!