Re: Automatic conflict resolution

Hello all,

>>Does anybody know of "language aware" merge tools?

This is quite close to refactoring techniques, where tool support exists for
improving the structure of code (example: the developer states "add this
variable to the parameterlist of function f", and the tool checks that no
accidents happen due to the change, and if not, performs the actual change
throughout the entire code).
Refactoring techniques focus on changing code structure without changing
functionality, but maybe the same kind of techniques can be applied to
changing functionality as well.

If a SCM could store the intended semantical change (such as adding a variable
or renaming a variable, etc), merging would a lot less painful, but one would
need additional tool support for making the changes happen in the real code.

>> I think that ClearCase has something for XML, but I am not sure.

I can imagine that someone has written a xml-diff/merge program, which would
go a long way towards reaching storage of semantical changes for the xml language.

Albert

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 24 15:16:35 2005