| Revision | 29487 (tree) |
|---|---|
| Time | 2022-11-30 06:12:41 |
| Author |  danielsahlberg |
TMerge didn't properly restore line numbers when undoing pasting multiple lines.
trunk/src/Changelog.txt (diff)
trunk/src/TortoiseMerge/BaseView.cpp (diff)| @@ -9,6 +9,8 @@ | ||
| 9 | 9 | - BUG: the repository tree control in the Checkout "Choose |
| 10 | 10 | items" dialog didn't resize properly when resizing |
| 11 | 11 | the window. (Daniel Sahlberg) |
| 12 | +- BUG: TMerge didn't properly restore line numbers when undoing | |
| 13 | + pasting multiple lines. (Daniel Sahlberg) | |
| 12 | 14 | |
| 13 | 15 | Version 1.14.5 |
| 14 | 16 | - BUG: 1.14.4 was wrongly linked against svn 1.14.1 |
| @@ -6765,9 +6765,9 @@ | ||
| 6765 | 6765 | { |
| 6766 | 6766 | m_pwndBottom->InsertViewEmptyLines(nViewLine + 1, nLinesToPaste - 1); |
| 6767 | 6767 | } |
| 6768 | + UpdateViewLineNumbers(); | |
| 6768 | 6769 | SaveUndoStep(); |
| 6769 | 6770 | |
| 6770 | - UpdateViewLineNumbers(); | |
| 6771 | 6771 | CUndo::GetInstance().EndGrouping(); |
| 6772 | 6772 | |
| 6773 | 6773 | ptCaretViewPos = SetupPoint(lines[nLinesToPaste - 1LL].GetLength(), nInsertLine); |
TortoiseSVN