Modify ↓

Ticket #4601 (closed defect: fixed)

Opened 2 years ago

Last modified 2 years ago

Conflict list dialog won't update unless I prod it

Reported by: avar Owned by: team
Priority: major Component: Core
Version: latest Keywords: conflict list
Cc:

Description

I've run into multiple instances where the conflict dialog didn't update.

  • A warning box says I have 10 conflicts but the dialog has nothing, but it appears when i minimize/maximize it
  • I have 50 conflicts, solve 5 interactively, the number doesn't change to 45 until I prod it again.

Attachments

Change History

comment:1 Changed 2 years ago by mjulius

  • Status changed from new to closed
  • Resolution set to duplicate

comment:2 Changed 2 years ago by mjulius

Closed as duplicate of #4593.

comment:3 Changed 2 years ago by skyper

  • Keywords conflict list added
  • Priority changed from normal to major
  • Status changed from closed to reopened
  • Resolution duplicate deleted

It happens again. I merge 2 files and I get some conflicts but the list stays empty until I close the list and reopen it. This happened with several files but not all the time. Sometimes it works right away.

comment:4 Changed 2 years ago by skyper

r3179-3184 with sun

comment:5 Changed 2 years ago by bastiK

  • Status changed from reopened to closed
  • Resolution set to fixed

(In [3186]) fixed #4601 - Conflict list dialog won't update unless I prod it

View ↑

Add a comment

Modify Ticket

Change Properties
<Author field>
Action
as closed
as The resolution will be set. Next status will be 'closed'
The resolution will be deleted. Next status will be 'reopened'
Author


E-mail address and user name can be saved in the Preferences.

Attachments ↑
 
Note: See TracTickets for help on using tickets.