Eclipse Community Forums: Subversive » Clicked Update, got Merge

Home » Eclipse Projects » Subversive » Clicked Update, got Merge

Clicked Update, got Merge [message #504791]

Tue, 22 December 2009 12:18

Eclipse User

Hi!

Is this a bug? I searched bugzilla, but found nothing like this.

In Synchronize, Incoming mode, I clicked the "Update All Incoming Changes" button and a dialog popped up:

(from memory, I did not save it)

Are you sure you want to merge these 52 items?

Why did the "update" turn into a "merge" ?

Regards,
David

PS: Using latest Eclipse JEE and subversive/svnkit.

Re: Clicked Update, got Merge [message #504865 is a reply to message #504791]

Tue, 22 December 2009 22:24

Eclipse User

David Balažic ha scritto:
> Are you sure you want to merge these 52 items?
>
>
> Why did the "update" turn into a "merge" ?

I work with CVS, not SVN, but in CVS too if you update from the
synchronize view, and if merges can be done automatically, they are
done. If not, a dialog will show (after the update process) saying that
there are changes in conflict that you have to merge manually.

Mauro.

Re: Clicked Update, got Merge [message #504866 is a reply to message #504865]

Wed, 23 December 2009 03:44

Eclipse User

In my case the question popped up right at beginning.

And I had no conflicts.

[Updated on: Tue, 22 December 2009 22:45] by Moderator

Re: Clicked Update, got Merge [message #504868 is a reply to message #504866]

Wed, 23 December 2009 03:52

Eclipse User

David Balažic ha scritto:
> In my case the question popped up right at beginning.

Maybe the implementation is different, however the concept is the same:
if you have changes in conflict and you click "update incoming changes",
if the implementation can merge it will do. Maybe Subversive just alerts
you before doing that.

Mauro.

Re: Clicked Update, got Merge [message #504873 is a reply to message #504868]

Wed, 23 December 2009 04:38

Eclipse User

As I said, I had no conflicts. Let's wait for some SVN guy to look into it...

[Updated on: Tue, 22 December 2009 23:39] by Moderator

Re: Clicked Update, got Merge [message #505173 is a reply to message #504791]

Mon, 28 December 2009 01:22

Eclipse User

Hello David,

This is terminology of Team Component and that's their dialog.

> Hi!
>
> Is this a bug? I searched bugzilla, but found nothing like this.
>
> In Synchronize, Incoming mode, I clicked the "Update All Incoming Changes"
> button and a dialog popped up:
>
> (from memory, I did not save it)
>
> Are you sure you want to merge these 52 items?
>
>
> Why did the "update" turn into a "merge" ?
>
> Regards,
> David
>
> PS: Using latest Eclipse JEE and subversive/svnkit.

Re: Clicked Update, got Merge [message #505180 is a reply to message #505173]

Mon, 28 December 2009 06:40

Eclipse User

David, from the other side I agree with you that it's not clear why you see
notes about merge when you make update action and so I created a defect for
Team component about it:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=298570 Note that you can add
yourself to CC to track bug activity.

> Hello David,
>
> This is terminology of Team Component and that's their dialog.

Previous Topic:	snv direct use
Next Topic:	Right bar in compare does not work same as in editor

Goto Forum:

-=] Back to Top [=-

Current Time: Sat Jul 26 18:09:59 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter