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

Bug 208526

Summary:	Override and Update does not update
Product:	[Eclipse Project] Platform	Reporter:	Markus Keller <markus.kell.r>
Component:	CVS	Assignee:	platform-cvs-inbox <platform-cvs-inbox>
Status:	CLOSED WONTFIX	QA Contact:
Severity:	normal
Priority:	P4	CC:	Michael.Valenta, tomasz.zarna
Version:	3.4	Keywords:	helpwanted
Target Milestone:	---
Hardware:	PC
OS:	Windows XP
Whiteboard:	stalebug

Description Markus Keller

2007-11-02 05:23:18 EDT

I20071101-2000

- non-model synchronization, incoming mode, 1 incoming change and 1 conflict
- select parent of both changes and choose Override and Update

=> expected: conflict overridden, incoming change updated
=> was: only conflict overridden

Comment 1 Tomasz Zarna

2007-11-27 11:36:27 EST

Markus, I've tried it for the simplest case* and it worked for me. Could you give me some details? Anything special about your project? I suppose Error Log is empty.

* a shared project with the following structure:
project/parent/file1.txt (conflicting change)
project/parent/file2.txt (incoming change)

Comment 2 Markus Keller

2007-11-27 11:40:11 EST

Did you try it with a non-model synchronization?

Comment 3 Tomasz Zarna

2007-11-27 11:50:23 EST

Ok, now I've got it too. Sorry about that.

Comment 4 Michael Valenta

2007-11-27 12:09:27 EST

It's worth pointing out that the non-modal Synchronization has always worked this way (i.e. since 3.0).

Comment 5 Tomasz Zarna

2007-11-28 04:55:55 EST

In this case I think we could lower its priority. Patches will be still accepted, though.

Comment 6 Eclipse Webmaster

2019-09-06 16:16:07 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 7 Eclipse Genie

2021-10-30 10:19:22 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.