04-18-2021 09:47 AM - edited 04-18-2021 09:51 AM
Yeah, I see artifacts introduced at lines 1060 - 1066 that indicate that TSVN outsmarted itself and tried to merge conflicting copies of the project file.
<<<<<<< .mine
<Property Name="Bld_version.build" Type="Int">182</Property>
||||||| .r418
<Property Name="Bld_version.build" Type="Int">141</Property>
=======
<Property Name="Bld_version.build" Type="Int">164</Property>
>>>>>>> .r423
You'll have to decide which version of this property is the right one and go with it. delete the others, delete the line <<<<<<< .mine, delete ||||||| .r418, delete >>>>>>> .r423. These are TSVN comments.
Edit:
I see you have chosen something else as a solution. It's actually easy to resurrect, as it was exactly what I thought it was in the first place. Going back in time is a solution, but this is probably the better solution, as after editing this file manually, you will end up with exactly the latest version of the project file, not something from the past.
04-18-2021 10:42 AM
Thanks Billko, it's a misunderstanding, I haven't chosen any solution yet, because this is an old thread, I may not be able to chose a solution. Before I post my question, I did some search, I found posting of exact issue, even though it's few years old, I followed it, I don't know it's a good practice or not, looks it's not because I don't have the option to select a solution.
You mentioned TSVN, do you mean TortoiseSVN? I'm surprised how do you know, because I don't find any of these words in the file. Actually, I did use TortoiseSVN to commit files, and it's the first time I've done it.
Regarding how to fix it, should I just use a text editor to edit it, save it as a text file, then change the extension to lvproj?
Thanks very much for your help.
04-18-2021 12:47 PM
@guangdew1 wrote:
Thanks Billko, it's a misunderstanding, I haven't chosen any solution yet, because this is an old thread, I may not be able to chose a solution. Before I post my question, I did some search, I found posting of exact issue, even though it's few years old, I followed it, I don't know it's a good practice or not, looks it's not because I don't have the option to select a solution.
You mentioned TSVN, do you mean TortoiseSVN? I'm surprised how do you know, because I don't find any of these words in the file. Actually, I did use TortoiseSVN to commit files, and it's the first time I've done it.
Regarding how to fix it, should I just use a text editor to edit it, save it as a text file, then change the extension to lvproj?
Thanks very much for your help.
LOL, the reason why I knew that TSVN (Tortoise SVN) was at the heart of the problem was because I've been bit by the issue before, and I knew exactly what to look for for the same reason. That's why I figured it wasn't going to be so bad to figure out what went wrong. It took me all of five minutes. 😉
So, make a backup copy, then use your favorite text editor to open the file (I use notepad++), make your edits, then save the file. I'd probably use the last version of that line since it is the most recent. I didn't make the edits myself, because I wanted you to make the choice.
I don't think missed any other instances of this, but maybe you can make a search for <<<<< or something just to make sure there aren't any more hidden edits.
04-18-2021 01:09 PM
Hi Bill, following your instruction, it worked. I feel sorry that I cannot reward you a solution; kudos, of course. I'm surprised that you know the stuff so well, you will have a great future.
04-18-2021 09:03 PM
@guangdew1 wrote:
Hi Bill, following your instruction, it worked. I feel sorry that I cannot reward you a solution; kudos, of course. I'm surprised that you know the stuff so well, you will have a great future.
I'm just glad I could help. 🙂