Additional information: The line that was "broken" had no changes in the revision I was merging from, actually it did not even exist there.
Regards, David On Thursday, 29 March 2018 17:09:03 UTC+2, David Balažic wrote: > > HI! > > Using: > TortoiseSVN 1.9.7, Build 27907 - 64 Bit , 2017/08/08 19:34:38 > > I did a merge of a change from another branch. > > In the commit step, in the dialog, there was the top folder and one file > listed as changed. > The folder had the mergeinfo recorded and the file had a few lines changed. > > After commiting and checking the log on another computer, I noted that the > mentioned file had two changes, not just the one shown in TortoiseMerge > before the commit. > > It turns out a nonascii charater a few lines above the other change was > changed in its encoding. > > Question: Why does TMerge not mark such a change as... a change? Is it > depending on some settings of TMerge? > > > Additional info: > > After that I edited the said file and changed that character back to UTF-8 > encoding. > Now TMerge says: > > --------------------------- > TortoiseMerge > --------------------------- > The text is identical, but the files do not match! > > The following differences were found: > > Encoding (ASCII, UTF-8) > --------------------------- > OK > --------------------------- > > > The problem here is, that I commited a change I did not know it was there, > as TM did not list it as a change. > > Is this a bug? > If not, how to avoid it in future? > > Regards, > David > -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/e04c770b-2e97-4a5a-a864-26fdb7628f5d%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
