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

Le 19/11/2015 10:06, fangebault+ml@xxxxxxxxxxxx a écrit :
> Le 18/11/2015 14:35, Alexander Gurov a écrit :
>> 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 don't see a drawback here. I believe that this is the actual behavior
with svn CLI.

>> 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.
> It seems a bit buggy with some use cases but it is probably because of
> my own changes. I'm still investigating on it.

OK, I finally found out that your patch works as expected when using the
JavaHL connector.
With the SVNKit connector it only works as expected when the user
selects the project's root directory for comparison. Otherwise,
selecting any subfolder for comparison is still buggy.
Do you have any hint on how to fix this?

Florent Angebault
Linagora - Support OSSA
Florent Angebault
Linagora - Support OSSA

Back to the top