Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Eclipse Platform » How to undo CVS "Mark As Merged"
How to undo CVS "Mark As Merged" [message #522584] Tue, 23 March 2010 09:07 Go to next message
Eclipse UserFriend
Originally posted by: adam.lipscombe.gmail.com

Hi


I am performing a complex merge and I have incorrectly marked 2 files as
merged using the "mark as merged" option. The are not merged correctly
and I need to re-merge them

How can I undo the "mark as merged"?

If I press the synchronisation view "refresh" button, or even restart
Eclipse the "mark as merged" setting for these 2 files persists.
The "Edit->Undo" and "Edit->Redo" options are greyed out.


What I want to do is to start the merge again from scratch, or at least
for the source package that contains the files in question.



Thanks - Adam
Re: How to undo CVS "Mark As Merged" [message #524069 is a reply to message #522584] Tue, 30 March 2010 09:26 Go to previous message
Eric Rizzo is currently offline Eric RizzoFriend
Messages: 3063
Registered: July 2009
Senior Member
On 3/23/10 5:07 AM, Adam Lipscombe wrote:
> Hi
>
>
> I am performing a complex merge and I have incorrectly marked 2 files as
> merged using the "mark as merged" option. The are not merged correctly
> and I need to re-merge them
>
> How can I undo the "mark as merged"?
>
> If I press the synchronisation view "refresh" button, or even restart
> Eclipse the "mark as merged" setting for these 2 files persists.
> The "Edit->Undo" and "Edit->Redo" options are greyed out.
>
>
> What I want to do is to start the merge again from scratch, or at least
> for the source package that contains the files in question.

That's a tricky one. The only thing I can think of is to create a patch
of the two files in question and then revert them back to the version in
the repository. Then apply your patch to the files (simulating you
making changes again) and try the merge again. I'm not certain that will
yield the desired result, but it's the only thing I can think of.

Hope this helps,
Eric
Previous Topic:Where is configuration of workspace projects?
Next Topic:Modifying the behavior of the internal web browser
Goto Forum:
  


Current Time: Thu Jan 18 09:52:52 GMT 2018

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

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