Hi

46 views
Skip to first unread message

Oto BREZINA, Printflow

unread,
May 1, 2019, 3:16:38 AM5/1/19
to tortois...@googlegroups.com
Hi Stefan, long time not see.

Sorry for merging multiple themes in one email all are short and does
not deserve separate thread :)

1) no nightly for latest

2) no nightly for 1.12 branch

3) no Langpacks/doc for 1.10 branch on tortoisesvn.net/downloads.html ?
Maybe more pages may need update and tweaks related to.

4) As I understand you have detection of read-only detection in T-Merge
for files. I would really like to see same rules applied to Left files
as is on right. So comparing two files from repository would default to
both read/write enabled.

5) here-and-there Im getting files in T-Merge out of sync, like it says
lines are same, but are on same line on display. It happen very sporadic
and cant yet stable reproduce. Have you seen it?

6) in T-Merge right click outside of selectect block selected block
under click to execute action on it. This happen mostly and I like, but
sometimes it select nothing at all.

Have a nice international work day :)

--
Oto BREZINA, +421 903653470, Printflow s.r.o.
J. Hagaru 9, 831 51 BRATISLAVA, Slovenská Republika

Stefan

unread,
May 2, 2019, 1:49:16 PM5/2/19
to TortoiseSVN-dev


On Wednesday, May 1, 2019 at 9:16:38 AM UTC+2, Oto BREZINA, Printflow wrote:
Hi Stefan, long time not see.

Sorry for merging multiple themes in one email all are short and does
not deserve separate thread :)

1) no nightly for latest

2) no nightly for 1.12 branch

nightly builds should be up and running again soon. Ian is working on it.
 

3) no Langpacks/doc for 1.10 branch on tortoisesvn.net/downloads.html ?
Maybe more pages may need update and tweaks related to.

The language packs and docs for 1.10.x can be found here:
 

4) As I understand you have detection of read-only detection in T-Merge
for files. I would really like to see same rules applied to Left files
as is on right. So comparing two files from repository would default to
both read/write enabled.

The left side is readonly by default, because in most situations you don't want/should/mustnot edit those files.
 

5) here-and-there Im getting files in T-Merge out of sync, like it says
lines are same, but are on same line on display. It happen very sporadic
and cant yet stable reproduce. Have you seen it?

if there's a white dot shown on the left of those lines, then you're ignoring whitespace changes so they're shown as not-modified, but the white dot indicates that there are still whitespace changes.
Other changes can be ignored too, like line-endings and of course if you've enabled a filter.
 

6) in T-Merge right click outside of selectect block selected block
under click to execute action on it. This happen mostly and I like, but
sometimes it select nothing at all.


I'm sorry I don't understand your problem description. Can you maybe explain it another way, e.g. what are you trying to do exactly and what happens instead?

Have a nice international work day :)


That's a normal work day here (I don't get why a "work day" is a holiday in some areas :) )

Stefan


Ot(ik)

unread,
May 3, 2019, 4:29:28 AM5/3/19
to TortoiseSVN-dev


On Thursday, May 2, 2019 at 7:49:16 PM UTC+2, Stefan wrote:


On Wednesday, May 1, 2019 at 9:16:38 AM UTC+2, Oto BREZINA, Printflow wrote:
Hi Stefan, long time not see.

Sorry for merging multiple themes in one email all are short and does
not deserve separate thread :)

Seems some do after all :)

 

3) no Langpacks/doc for 1.10 branch on tortoisesvn.net/downloads.html ?
Maybe more pages may need update and tweaks related to.

The language packs and docs for 1.10.x can be found here:

True, but  tortoisesvn.net/downloads.html offect 1.10, without Lang packs, seems incomplete for me. I would recommend either remove 1.10, or complete it with langpacks and docs. Maybe separate pages would do.

 

4) As I understand you have detection of read-only detection in T-Merge
for files. I would really like to see same rules applied to Left files
as is on right. So comparing two files from repository would default to
both read/write enabled.

The left side is readonly by default, because in most situations you don't want/should/mustnot edit those files.

I understand it. So no way to change?
I usually compare two files of WC and quite often need change change both.
1) I have either switch sides, or enable editing on left (i have to switch to left first), edit.
2) Then to compare save and refresh. reapeat 1 and 2 until done (maybe 10 times depending on change in progress)

I would like to see left (and right as well for that matter) locked if file itself is read only or is temporary (e.g. from repository).
Comparing two files from repository has no mean to change either, while comparing WC files has reason to change both.

I'm aware it is somewhat outside your intended use case, but it works for me quite great, but the need click to disable read-only.
 
 

5) here-and-there Im getting files in T-Merge out of sync, like it says
lines are same, but are on same line on display. It happen very sporadic
and cant yet stable reproduce. Have you seen it?

if there's a white dot shown on the left of those lines, then you're ignoring whitespace changes so they're shown as not-modified, but the white dot indicates that there are still whitespace changes.
Other changes can be ignored too, like line-endings and of course if you've enabled a filter.

maybe you don't understand my request or me your answer. I will try to send you a screenshot privately when i get into that issue again. When it happen it is quite stable, but i could not make it on small files.
the sync error is simply when you have block which is same on both sides, but on right it is displayed like line or more up (line 1 of block on left is in line with line 2 of block on right etc.) I tried enable/disable whitespaces etc, but it changed nothing at that time.


 
 

6) in T-Merge right click outside of selectect block selected block
under click to execute action on it. This happen mostly and I like, but
sometimes it select nothing at all.


I'm sorry I don't understand your problem description. Can you maybe explain it another way, e.g. what are you trying to do exactly and what happens instead?

Hmm, I just rechecking and can not get it working. I will try explain anyway, maybe it will turn bug report into feature request :o

0) open not same files in T-Merge (comparing two files-2pane or conflict resolution-3pane) with multiple changes (preferably in blocks)
1) use scroll and/or navigation pane to have some change displayed - should be not selected
2) right click on left panel over change
I expected that change block get selected and context menu related to that block apeared.
This was happeningoften, but not always. Like when i start resolving it was working for 3-4 times and then sudenly stoped - block under mouse was not autoselected.
For me there is little sense to execute context menu for block outside of view, nor for single line is perfect.


 

Have a nice international work day :)


That's a normal work day here (I don't get why a "work day" is a holiday in some areas :) )


me either, but Im glad i got holiday :)

Stefan


Oto
Reply all
Reply to author
Forward
0 new messages