[Trac] [AllemaniACs] #43: Default config conflict resolver

AllemaniACs trac-notifications at lists.kbsg.rwth-aachen.de
Mon Apr 28 14:10:40 CEST 2008

#43: Default config conflict resolver
 Reporter:  tim      |       Owner:  AllemaniACs
     Type:  feature  |      Status:  new        
 Priority:  major    |   Milestone:             
Component:  Fawkes   |    Keywords:  config     
 One of the shortcomings of the database approach for storing the config
 values is that it's basically binary data. This cannot be easily merged by
 Subversion. Because we have the default database in the repository it is
 likely that two developers produce conflicts in that file (any two
 concurrent changes conflict, no matter if both just added new values).

 Up to now I always resolved the conflicts by dumping the old and the new
 databases and executing the insert/delete/update statements on my copy and
 then marked it as resolved and checked it in.

 A small tool is needed to automate that task with cherry-picking of
 changes made to produce the new conflict-free config version.

Ticket URL: <https://lechuck.informatik.rwth-aachen.de:2342/trac/ticket/43>
AllemaniACs <http://robocup.rwth-aachen.de>
AllemaniACs Trac

More information about the fawkes-trac mailing list