Bug 182 - Merge does not allow you to merge changes from another project (1GFBKI3)
Summary: Merge does not allow you to merge changes from another project (1GFBKI3)
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Team (show other bugs)
Version: 2.0   Edit
Hardware: All All
: P4 normal (vote)
Target Milestone: 2.0 M4   Edit
Assignee: James Moody CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2001-10-10 21:37 EDT by Jean-Michel Lemieux CLA
Modified: 2002-03-20 17:27 EST (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jean-Michel Lemieux CLA 2001-10-10 21:37:47 EDT 
In the merge dialog we allow you to select the project from which you would like to 
merge changes. Our implementation does not allow this since we don't do the right
path magic to load files form ProjectA into ProjectB.

To duplicate create two projects in your workspace that have streams that could
be merged. Chose merge on ProjectA and merge changes from ProjectB. The
merge dialogs will appear but when you catchup you are actually modifying the
contents of ProjectB in your workspace.

NOTES:

Jean-Michel (14/06/2001 12:42:35 PM)
	A documentation candidate or remove the project selection list from the
	merge wizard.
Comment 1 DJ Houghton CLA 2001-10-23 23:45:56 EDT 
PRODUCT VERSION:
0.123
Comment 2 Kevin McGuire CLA 2002-03-20 17:27:05 EST 
list is now correct