| CODENOTIFIER | HelpYou are not signed inSign in |
Project: TortoiseSVN
Revision: 13825
Author: steveking
Date: 04 Sep 2008 14:00:15
Changes:Use the merged info if the merged revision is valid, not just if the merged revision is smaller than the actual revision.
Files:| ...... | @@ -56,7 +56,7 @@ | |
| 56 | 56 | CStringA authorA(author); |
| 57 | 57 | CStringA pathA(merged_path); |
| 58 | 58 | TCHAR c = ' '; |
| 59 | if (!merged_author.IsEmpty() && (merged_revision < revision)) | |
| 59 | if (!merged_author.IsEmpty() && (merged_revision > 0)) | |
| 60 | 60 | { |
| 61 | 61 | dateA = CStringA(merged_date); |
| 62 | 62 | authorA = CStringA(merged_author); |