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

Bug 15436

Summary:	[CVS UI] Merge from HEAD - resulting file wasn't managed
Product:	[Eclipse Project] Platform	Reporter:	Kevin McGuire <Kevin_McGuire>
Component:	Team	Assignee:	Platform-VCM-Inbox <platform-vcm-inbox>
Status:	RESOLVED WONTFIX	QA Contact:
Severity:	normal
Priority:	P3	Keywords:	usability
Version:	2.0
Target Milestone:	---
Hardware:	PC
OS:	All
Whiteboard:

Description Kevin McGuire

2002-05-07 11:39:22 EDT

1. had a split of a branch yesterday
2. tried to update my branch of a package with the latest, so did a merge 
against HEAD
3. saw the incomming change I wanted - a new file in HEAD
4. merged it locally

Result (bug?): the file came in unmanaged, and thus without revision info.  I 
would expect to get the same revision of the file as was released in HEAD, yes?

Bug: try to add the file to version control.  This fails (of course) because 
it "was added by thirdparty".

Comment 1 Jean-Michel Lemieux

2002-05-07 13:09:34 EDT

It is expected that new files (you don't have them in the branch loaded in the
workbench) that are updated become unmanaged as a result of the merge. Merging
is *always* a content operation in CVS as merge sources are not persisted in the
repo!

Once the unmanaged file is in your workspace you can add/commit. I've verified
this several times today and it works for me. To get the error you mention, you
would of had to of already released that file to the branch at some other time.

Comment 2 Kevin McGuire

2002-05-09 13:47:47 EDT

Marking future.  Would be good to be able to tag files on different branches 
under those conditions where we can.

In my failure case I had branched the entire project, then backed out realizing 
I really only wanted to branch the package. So I replaced the project with 
head, but reverted the package with the branch. I then tried to 'add' the file 
that was in head to my branch.

Comment 3 Michael Valenta

2002-09-09 19:02:26 EDT

Reopening

Comment 4 Michael Valenta

2004-03-24 14:22:05 EST

We help the user by offering to add files during a commit. In the case of 
conflicting additions, we offer Mark as Merged and Override and Commit.