• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision29487 (tree)
Zeit2022-11-30 06:12:41
Autordanielsahlberg

Log Message

TMerge didn't properly restore line numbers when undoing pasting multiple lines.

https://groups.google.com/g/tortoisesvn-dev/c/Pt99jN99STg

Ändern Zusammenfassung

Diff

--- trunk/src/Changelog.txt (revision 29486)
+++ trunk/src/Changelog.txt (revision 29487)
@@ -9,6 +9,8 @@
99 - BUG: the repository tree control in the Checkout "Choose
1010 items" dialog didn't resize properly when resizing
1111 the window. (Daniel Sahlberg)
12+- BUG: TMerge didn't properly restore line numbers when undoing
13+ pasting multiple lines. (Daniel Sahlberg)
1214
1315 Version 1.14.5
1416 - BUG: 1.14.4 was wrongly linked against svn 1.14.1
--- trunk/src/TortoiseMerge/BaseView.cpp (revision 29486)
+++ trunk/src/TortoiseMerge/BaseView.cpp (revision 29487)
@@ -6765,9 +6765,9 @@
67656765 {
67666766 m_pwndBottom->InsertViewEmptyLines(nViewLine + 1, nLinesToPaste - 1);
67676767 }
6768+ UpdateViewLineNumbers();
67686769 SaveUndoStep();
67696770
6770- UpdateViewLineNumbers();
67716771 CUndo::GetInstance().EndGrouping();
67726772
67736773 ptCaretViewPos = SetupPoint(lines[nLinesToPaste - 1LL].GetLength(), nInsertLine);
Show on old repository browser