Why are we getting conflicts in Tmerge after 1.10 update?

32 views
Skip to first unread message

Scott Adams

unread,
Jun 6, 2018, 9:08:27 AM6/6/18
to TortoiseSVN

Why are we getting these conflicts? (see attached screenshot)

 

This started after upgrading SVN to the 1.10

We use a simple Regex filter to be able to ignore line number differences in our files.

Regex: (\d{4}:\d{4})

Replace: linenumber

 

 

What we are seeing are a large number of conflicts on lines that only the line numbers are different. But this only occurs sporadically.

Attached is a screen shot showing how the line numbers are different throughout but the conflicts suddenly stop.

 


tmerge.jpg

Stefan

unread,
Jun 6, 2018, 1:10:56 PM6/6/18
to TortoiseSVN
the regex filter is only that: a filter.
It does not change the file before diffing but simply makes TMerge not show the differences while viewing.
That means the conflict still exists.

Scott Adams

unread,
Jun 6, 2018, 2:50:21 PM6/6/18
to TortoiseSVN
Stefan,

Please note in the screenshot that ALL lines are not the same (in effect in conflict) but only some show the red conflict color. The lines there are identical except for line number. Something else must be going on.

Again this was working fine in 1.9  Turning on this filter would remove all conflicts except lines that were changed in other than the line number area.

Thanks for your time,

Scott

Stefan

unread,
Jun 6, 2018, 3:19:36 PM6/6/18
to TortoiseSVN
Please note in the screenshot that ALL lines are not the same (in effect in conflict) but only some show the red conflict color. The lines there are identical except for line number. Something else must be going on.

Again this was working fine in 1.9  Turning on this filter would remove all conflicts except lines that were changed in other than the line number area.

in that case, the conflict usually is in whitespace or even line-endings.
click the "show whitespace" button and you might see some conflicts.

Stefan

Scott Adams

unread,
Jun 8, 2018, 5:07:41 PM6/8/18
to TortoiseSVN

As noted in the above screen shot we had Whitespace shut off we also ran it again with Show whitespace and no issues were seen.

We have switched over to using Beyond Compare in place of Tmerge for the time being. 

Stefan

unread,
Jun 9, 2018, 2:28:39 AM6/9/18
to TortoiseSVN
the conflict might also be in line endings, which you can enable in the settings dialog.
Reply all
Reply to author
Forward
0 new messages