On Thu, Sep 29, 2011 at 1:54 PM, Camillo Bruni
<camillo.bruni@inria.fr> wrote:
Hi everyone,
I am improving the way the Monticello UI handles conflicts when doing a load.
Right now you just get a warning which lets you decide whether to overwrite the local changes or simply cancel the action � a merge action is missing!
I added the marge behavior, so far so good, but there is a slight glitch:
The conflict message is shown based on conflicts on the package level, for performance reasons. Lets assume that the loaded version only contains new classes for the package that you changed locally, you still get a conflict message although the changes can be loaded without problems.
So my question is on how to load stuff in this case:
� � � �- go the git/svn way and load everything if there are no conflicts
is it easy now to define WHAT is a conflic ?
�
� � � �- load everything if there are only added entities (not removals/modifications)
I think this could be a first step, and the continue with the first item.
�
� � � �- always show the merge/diff view to check what changed manually
No always, but it would be nice to have that option as well. For example, if I load a new version of Seaside, I don't care what has changed, since I am not a developer of such project. I just want to load. Now...if I am loading a new version of Fuel or DBXTAlk I would like to see the diff. Anyway, I can always do a "changes" before loading ;)� (that's what I do now)
�
cami