[Geany-devel] glade diffs - Re: encoding combo boxes bug

[Nick Treleaven]

On 22/01/2012 13:01, Nick Treleaven wrote:
> On 20/01/2012 18:39, Colomban Wendling wrote:
>> @Nick: how did you generate the Glade file for
>> 21cd7bb2139fd67644e5777bb8e6387d34473d09 "Add Project overrides for
>> 'Saving files' checkbox options"? When I do use Glade 3.8.1 do modify
>> the file it keeps reordering prefs/project dialogs... Just wondering,
>> actually committing the move isn't really harmful -- apart that it
>> renders the diff unreadable, stupid Glade.
>
> You're right, sadly my idea of using the same version of Glade doesn't
> prevent huge unreadable diffs. I committed 'regenerate with Glade 3.8.1'
> as an experiment, which failed.

BTW unnecessarily large diffs are a real problem for another reason - 
they make a merge conflict much more likely. Ideally Glade would fix 
this reordering behaviour as it's bound to cause us trouble sooner or later.