Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [subversive-dev] Weird behavior of the "Compare with branch" feature

Thank you so much for this patch!

It seems a bit buggy with some use cases but it is probably because of
my own changes. I'm still investigating on it.

Le 18/11/2015 14:35, Alexander Gurov a écrit :
> Hello,
> After carefully analysing what will we get out of this functionality as
> it is, it seems it could not be implemented quite well yet. So, I
> suggest to simplify the code in this way:
> 1) We do compare the resources specified directly with 2-way comparision.
> 2) All the files that are changed locally would be marked as an outgoing
> changes
> 3) All other changes would be marked as an incoming changes.
> The drawback of such solution is that we can't detect conflicting
> changes, still when the editor of the file is opened, we will be able to
> show where there are conflicts, incoming and outgoing changes.
> I'm attaching the patch, so that you could try it and suggest any
> changes if you see the reason to do so. If you think it is all right as
> it is, then please let me know and I'll submit these changes to the
> repository.
> Thank you in advance.
> Best regards,
> Alexander Gurov,
> Subversive Team.
> 17.11.2015 17:11, fangebault+ml@xxxxxxxxxxxx пишет:
>> Le 04/11/2015 10:06, fangebault+ml@xxxxxxxxxxxx a écrit :
>>> I wasn't aware of the three-way comparison stuff and I naively though
>>> that it would just be a matter of re-implementing methods
>>> SVNUtility#diffStatus().
>>> I'm not familiar with subversive's API but I'll give it a try.
>> OK now I know it's not that simple. Can you suggest me a quick-and-dirty
>> fix that would not handle three-way comparison?
>> I would like to provide our customer with a temporary fix so that at
>> least he would not be misleaded by this feature.

Florent Angebault
Linagora - Support OSSA

Back to the top