Re: [subversive-dev] How to prevent automatic merge

[Biörnstad, Biörn <Bioern.Bioernstad@xxxxxxxxx>]

Hi Alexander,

I am a bit confused by your answer. I have done tests with SVNKit and the Eclipse team framework. When using SVNKit, I am able to take control over the merging process through the ISVNMerger interface. In Eclipse, I seem to be able to do the same through a IResourceMappingMerger. However, it seems that the merger is invoked only when executing "Update All" in the synchronize view (MergeAllOperation/ModelMergeOperation), not during a "normal" update.

Can you clear up my confusion? What are the missing bits in Subversive?

Thanks,
Biörn

________________________________________
From: subversive-dev-bounces@xxxxxxxxxxx [subversive-dev-bounces@xxxxxxxxxxx] on behalf of Alexander Gurov [alexander.gurov@xxxxxxxxxxxx]
Sent: Tuesday, July 17, 2012 21:37
To: Developers mailing list
Subject: Re: [subversive-dev] How to prevent automatic merge

Hello Biörn,

Unfortunately there is no way to interfere with the SVN client library
merging files on update/merge/switch (neither one of both libraries -
SVN Kit and JavaHL - provides such API) and this is why it is impossible
in Subversive as well,

Best regards,
Alexander.

17.07.2012 16:02, Biörnstad, Biörn пишет:
> Hi,
>
> What is the easiest way of preventing Subversive from automatically merging files? When the user executes an update operation, I do not want any automatic merges to take place, as with binary files.
>
> I have tried providing an IResourceMappingMerger and an IStorageMerger, but it did not work for me.
>
> Thanks,
> Biörn