Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 91582

Summary:	[Sync View] Re-doing a merge - controls are very unintuitive
Product:	[Eclipse Project] Platform	Reporter:	Joe Zulli <joezulli>
Component:	CVS	Assignee:	platform-cvs-inbox <platform-cvs-inbox>
Status:	CLOSED WONTFIX	QA Contact:
Severity:	minor
Priority:	P5	Keywords:	helpwanted
Version:	3.0.1
Target Milestone:	---
Hardware:	Macintosh
OS:	All
Whiteboard:	stalebug

Description Joe Zulli

2005-04-15 14:03:29 EDT

Often times I merge my code from branch to the HEAD, then cancel it out before I
commit my changes, either because of a mistake or some other reason. I then
refresh by replacing my code with the latest from HEAD and try it again. This
next time I run the merge, it tells me that there are no conflicts. This is not
correct because I never committed the original merge. I learned from asking the
newgroup that the reason for this is that the Synchronize view remembers state
and you have to refresh it by clicking on the view's drop down menu and
selecting "Remove Current Synchronization." 

I tried this and it works, but I'm opening this bug because this functionality
is very unintuitive. When I was having this problem I asked at least 10 people
at my work how to refresh the merge and none of them knew. They all just
switched to another workspace as a workaround. I can guarantee that there are
many others just like me and my co-workers who are confused and frustruated with
this. I think the controls need to be made more intuitive and perhaps documented
a little more clearly. Moving the "Remove Current Synchronization" action out of
that menu and on to the front tool bar and giving it a verbose tooltip help, I
think. Maybe having a preference that allows you to never remember
synchronization information would be helpful as well.

Comment 1 Michael Valenta

2005-04-20 09:28:33 EDT

We keep track of the merge state to compensate for the lack of support for 
this in CVS itself. This is a great help if you are working in a branch and 
want to keep it up-to-date with HEAD. I.e. each time you refresh the merge, 
you will only see what has changed since the last time you merged.

Perhaps we should add a toggle to the toolbar that allows the user to turn 
this behavior on and off since, in most cases, I suspect they are not 
performing ongoing merges.

Comment 2 Eclipse Webmaster

2019-09-06 16:11:21 EDT

This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet.

If you have further information on the current state of the bug, please add it. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant.

Comment 3 Eclipse Genie

2021-09-05 14:22:32 EDT

This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet. As such, we're closing this bug.

If you have further information on the current state of the bug, please add it and reopen this bug. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant.

--
The automated Eclipse Genie.