Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Subversive » New Merge dialog?
New Merge dialog? [message #38097] Tue, 18 November 2008 03:52 Go to next message
Gernot Belger is currently offline Gernot Belger
Messages: 1
Registered: July 2009
Junior Member
Hi!

Since Eclipse 3.4 i have a problem with the merge dialog of subversive.

Before (eclipse 3.3, subversive 2.0.0, SVNKit 1.1.4), the merge dialog
showed the INCOMING changes from the merge (and also merge conflicts).
This was very nice!

Now (eclipse 3.4, subversive 2.0.5, Connector SVN 1.5.2/SVNKit 1.2.0), the
merge immediately changes the local files and presents outgoing changes in
the merge dialog. Conflicts are not shown in the diff view :-( Yet another
problem: new files in the trunc are remove (!!) when mergin is done...
(that never happens with the old dialog).

What has happened? Why is the very good old behaviour gone? Is is possible
to still use the old dialog? At the moment i am still eclipse 3.3 only to
merge my projetcs...

Best regards
Gernot
Re: New Merge dialog? [message #38199 is a reply to message #38097] Thu, 20 November 2008 09:29 Go to previous messageGo to next message
Igor Burilo is currently offline Igor Burilo
Messages: 435
Registered: July 2009
Senior Member
Hello Gernot,

We have such a behaviour for merge in order to support svn's 1.5 merge
tracking.

> Hi!
>
> Since Eclipse 3.4 i have a problem with the merge dialog of subversive.
>
> Before (eclipse 3.3, subversive 2.0.0, SVNKit 1.1.4), the merge dialog
> showed the INCOMING changes from the merge (and also merge conflicts).
> This was very nice!
>
> Now (eclipse 3.4, subversive 2.0.5, Connector SVN 1.5.2/SVNKit 1.2.0), the
> merge immediately changes the local files and presents outgoing changes in
> the merge dialog. Conflicts are not shown in the diff view :-( Yet another
> problem: new files in the trunc are remove (!!) when mergin is done...
> (that never happens with the old dialog).
>
> What has happened? Why is the very good old behaviour gone? Is is possible
> to still use the old dialog? At the moment i am still eclipse 3.3 only to
> merge my projetcs...
>
> Best regards
> Gernot
>
>
>
>
>
>
>
Re: New Merge dialog? [message #38570 is a reply to message #38199] Mon, 01 December 2008 04:55 Go to previous messageGo to next message
Francois Cottet is currently offline Francois Cottet
Messages: 19
Registered: July 2009
Junior Member
Hi,

Could you elaborate a bit more?
Because the behavior described below is a bit scary: Subversive can
delete by itself some files on our local workspace?
It does not look very reasonable to do this without any confirmation by
the user, does it?

Regards,
Francois



Igor Burilo wrote:
> Hello Gernot,
>
> We have such a behaviour for merge in order to support svn's 1.5 merge
> tracking.
>
>> Hi!
>>
>> Since Eclipse 3.4 i have a problem with the merge dialog of subversive.
>>
>> Before (eclipse 3.3, subversive 2.0.0, SVNKit 1.1.4), the merge dialog
>> showed the INCOMING changes from the merge (and also merge conflicts).
>> This was very nice!
>>
>> Now (eclipse 3.4, subversive 2.0.5, Connector SVN 1.5.2/SVNKit 1.2.0), the
>> merge immediately changes the local files and presents outgoing changes in
>> the merge dialog. Conflicts are not shown in the diff view :-( Yet another
>> problem: new files in the trunc are remove (!!) when mergin is done...
>> (that never happens with the old dialog).
>>
>> What has happened? Why is the very good old behaviour gone? Is is possible
>> to still use the old dialog? At the moment i am still eclipse 3.3 only to
>> merge my projetcs...
>>
>> Best regards
>> Gernot
>>
>>
>>
>>
>>
>>
>>
>
>
Please reinstate old merge preview! Re: New Merge dialog? [message #48016 is a reply to message #38570] Wed, 01 July 2009 08:29 Go to previous message
Eclipse User
Originally posted by: joerg.von.frantzius.artnology.com

Hi,

to whom it may concern, I filed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=282143 as an enhancement
request for reinstating the old merge preview functionality, which could
optionally be chosen by the user in favor of support for merge tracking.

It's really a pity that this useful feature had been dropped completely
in favor of merge tracking.

Regards,
Jörg

Francois Cottet wrote:
> Hi,
>
> Could you elaborate a bit more?
> Because the behavior described below is a bit scary: Subversive can
> delete by itself some files on our local workspace?
> It does not look very reasonable to do this without any confirmation
> by the user, does it?
>
> Regards,
> Francois
>
>
>
> Igor Burilo wrote:
>> Hello Gernot,
>>
>> We have such a behaviour for merge in order to support svn's 1.5
>> merge tracking.
>>
>>> Hi!
>>>
>>> Since Eclipse 3.4 i have a problem with the merge dialog of subversive.
>>>
>>> Before (eclipse 3.3, subversive 2.0.0, SVNKit 1.1.4), the merge
>>> dialog showed the INCOMING changes from the merge (and also merge
>>> conflicts). This was very nice!
>>>
>>> Now (eclipse 3.4, subversive 2.0.5, Connector SVN 1.5.2/SVNKit
>>> 1.2.0), the merge immediately changes the local files and presents
>>> outgoing changes in the merge dialog. Conflicts are not shown in the
>>> diff view :-( Yet another problem: new files in the trunc are remove
>>> (!!) when mergin is done... (that never happens with the old dialog).
>>>
>>> What has happened? Why is the very good old behaviour gone? Is is
>>> possible to still use the old dialog? At the moment i am still
>>> eclipse 3.3 only to merge my projetcs...
>>>
>>> Best regards
>>> Gernot
>>>
>>>
>>>
>>>
>>>
>>>
>>>
>>
>>
Previous Topic:Subversive is 'mutating' .svn files to higher revision, breaking other clients
Next Topic:Compare with options disabled on folders
Goto Forum:
  


Current Time: Tue Jul 22 13:34:16 EDT 2014

Powered by FUDForum. Page generated in 0.02062 seconds