• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision15161 (tree)
Zeit2009-01-23 02:57:16
Autorstefankueng

Log Message

Merge r15160 from trunk:
* Don't add a newline if the line has the style EOL_NOENDING.

Ändern Zusammenfassung

Diff

--- branches/1.5.x/src/Changelog.txt (revision 15160)
+++ branches/1.5.x/src/Changelog.txt (revision 15161)
@@ -9,6 +9,8 @@
99 in it didn't work. (Stefan)
1010 - BUG: TortoiseMerge showed a black line diff in one-pane view. (Stefan)
1111 - BUG: The styling of bug IDs in the commit dialog could fail. (Stefan)
12+- BUG: TortoiseMerge added a newline at the end of a file when saving
13+ modifications. (Stefan)
1214
1315 Version 1.5.6
1416 - CHG: Disabled capieng again - users were annoyed. (Stefan)
--- branches/1.5.x/src/TortoiseMerge/FileTextLines.cpp (revision 15160)
+++ branches/1.5.x/src/TortoiseMerge/FileTextLines.cpp (revision 15161)
@@ -1,6 +1,6 @@
11 // TortoiseMerge - a Diff/Patch program
22
3-// Copyright (C) 2007-2008 - TortoiseSVN
3+// Copyright (C) 2007-2009 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -452,7 +452,7 @@
452452 if (bIgnoreCase)
453453 sLine = sLine.MakeLower();
454454 file.Write((LPCTSTR)sLine, sLine.GetLength()*sizeof(TCHAR));
455- if ((ending == EOL_AUTOLINE)||(ending == EOL_NOENDING))
455+ if (ending == EOL_AUTOLINE)
456456 ending = m_LineEndings;
457457 switch (ending)
458458 {
@@ -488,7 +488,7 @@
488488 sLine = sLine.MakeLower();
489489 if ((m_bReturnAtEnd)||(i != GetCount()-1))
490490 {
491- if ((ending == EOL_AUTOLINE)||(ending == EOL_NOENDING))
491+ if (ending == EOL_AUTOLINE)
492492 ending = m_LineEndings;
493493 switch (ending)
494494 {
@@ -530,7 +530,7 @@
530530
531531 if ((m_bReturnAtEnd)||(i != GetCount()-1))
532532 {
533- if ((ending == EOL_AUTOLINE)||(ending == EOL_NOENDING))
533+ if (ending == EOL_AUTOLINE)
534534 ending = m_LineEndings;
535535 switch (ending)
536536 {
Show on old repository browser