Login | Register
My pages Projects Community openCollabNet

Discussions > users > "Override and update" from conflicts view

subclipse
Discussion topic

Back to topic list

"Override and update" from conflicts view

Author znbailey
Full name Zach Bailey
Date 2007-08-15 08:23:25 PDT
Message I just had a frustrating behavior bite me...

I did the following:

1.) Sync'd and saw I had some conflicts on about 10 files
2.) Instead of selecting each file individually, I selected the project
root in the synchronizing view and did "override and update" expecting
it to only override and update the CONFLICTS since I was in the conflict
view rather than overridding and updating the
whole project. Unfortunately this proceeded to wipe out a rather large
amount of work I had done over the past couple of days.
3.) I tried restoring changes from the local history and found I could
only restore "new" files that had not yet been added to the repository.
Changes on existing, versioned files were completely wiped out and the
local history was completely wiped out too
(http://subclipse.tig​ris.org/issues/show_​bug.cgi?id=575).

I am now facing the fact that I have to re-write a significant portion
of some work I've been doing over the past 2 days, which is very
frustrating.

I have already commented/voted on issue 575 which convers maintaining
local history, and I encourage other people to do so as well.

My question is regarding the default behavior of the conflicts view in
the synchronize view. If I select the project root in that view and do
override and update, my intuition tells me that/I am expecting that
subclipse will only override and update the items that appear in that
view, which is similar to the other views. For example if I remove a
file from the "outgoing" view and then select to commit the project root
from that view, I expect the file I removed not to show up.

Am I off base here, or is this just an oversight in the module that
handles this view action?

Thanks,
-Zach

« Previous message in topic | 1 of 2 | Next message in topic »

Messages

Show all messages in topic

"Override and update" from conflicts view znbailey Zach Bailey 2007-08-15 08:23:25 PDT
     Re: [Subclipse-users] "Override and update" from conflicts view Mark Phippard <markphip at gmail dot com> Mark Phippard <markphip at gmail dot com> 2007-08-15 08:38:36 PDT
Messages per page: