Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Subversive » Clicked Update, got Merge
Clicked Update, got Merge [message #504791] Tue, 22 December 2009 17:18 Go to next message
David  Balažic is currently offline David BalažicFriend
Messages: 128
Registered: July 2009
Senior Member
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] Wed, 23 December 2009 03:24 Go to previous messageGo to next message
Mauro Molinari is currently offline Mauro MolinariFriend
Messages: 281
Registered: July 2009
Senior Member
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 08:44 Go to previous messageGo to next message
David  Balažic is currently offline David BalažicFriend
Messages: 128
Registered: July 2009
Senior Member
In my case the question popped up right at beginning.

And I had no conflicts.

[Updated on: Wed, 23 December 2009 03:45]

Report message to a moderator

Re: Clicked Update, got Merge [message #504868 is a reply to message #504866] Wed, 23 December 2009 08:52 Go to previous messageGo to next message
Mauro Molinari is currently offline Mauro MolinariFriend
Messages: 281
Registered: July 2009
Senior Member
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 09:38 Go to previous messageGo to next message
David  Balažic is currently offline David BalažicFriend
Messages: 128
Registered: July 2009
Senior Member
As I said, I had no conflicts. Let's wait for some SVN guy to look into it...

[Updated on: Wed, 23 December 2009 04:39]

Report message to a moderator

Re: Clicked Update, got Merge [message #505173 is a reply to message #504791] Mon, 28 December 2009 06:22 Go to previous messageGo to next message
Igor Burilo is currently offline Igor BuriloFriend
Messages: 435
Registered: July 2009
Senior Member
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 11:40 Go to previous message
Igor Burilo is currently offline Igor BuriloFriend
Messages: 435
Registered: July 2009
Senior Member
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:New Repository button disabled
Next Topic:Right bar in compare does not work same as in editor
Goto Forum:
  


Current Time: Thu Dec 18 00:46:14 GMT 2014

Powered by FUDForum. Page generated in 0.02115 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software