Glade files in a vcs

Asked by Matthias Müller-Reineke on 2007-07-26

I've observed that Glade (Glade 2.12.1 from Ubuntu 6.06) creates unnecessary changes in the glade file when for example a tool button is added. This causes merge conflicts. What do you do?
* You edit your glade files with a text editor.
* You use a more clever merge tool.
* You avoid such situations.
* You use a version of Glade which avoids this trouble.

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar GTK+ Frontends Edit question
Assignee:
No assignee Edit question
Solved by:
Jelmer Vernooij
Solved:
Last query:
Last reply:
Revision history for this message
Best Jelmer Vernooij (jelmer) said :
#1

Personally, I use a text editor anyway so I haven't seen this problem.

Ideally, I think a custom merge algorithm should be used to handle problems like this.

Revision history for this message
Matthias Müller-Reineke (matthias-mueller-reineke) said :
#2

Instead of editing Glade files one could create the user interface with Python code. One advantage would be that this great programing language makes it possible to avoid redundancies.

Revision history for this message
Mateusz Korniak (matkor) said :
#3

I found glade-2 making enormous changes in glade files making them nonmergable for humans.
glade 3.2.2 & 3.2.4 makes much more sane changes to XML making it easy to merge.