Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 332640 - [backport] Team > Merge operation for project contains logical model always show no changes between two branches
Summary: [backport] Team > Merge operation for project contains logical model always s...
Status: VERIFIED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: CVS (show other bugs)
Version: 3.4.2   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: 3.6.2   Edit
Assignee: Tomasz Zarna CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 315694
Blocks:
  Show dependency tree
 
Reported: 2010-12-15 09:56 EST by Tomasz Zarna CLA
Modified: 2011-02-01 03:47 EST (History)
3 users (show)

See Also:
Szymon.Brandys: review+

Attachments
Fix from bug 315694 (13.04 KB, patch)
2011-01-05 05:54 EST, Tomasz Zarna CLA 		no flags Details | Diff
mylyn/context/zip (78.66 KB, application/octet-stream)
2011-01-05 05:54 EST, Tomasz Zarna CLA 		no flags Details
Update fix (14.81 KB, patch)
2011-01-19 08:13 EST, Tomasz Zarna CLA 		no flags Details | Diff
Show Obsolete (1) View All 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 Tomasz Zarna CLA 2010-12-15 09:56:27 EST 
Backport of bug 315694 to 3.6.2.
Comment 1 Tomasz Zarna CLA 2011-01-05 05:54:17 EST 
Created attachment 186081 [details]
Fix from bug 315694
Comment 2 Tomasz Zarna CLA 2011-01-05 05:54:21 EST 
Created attachment 186082 [details]
mylyn/context/zip
Comment 3 Tomasz Zarna CLA 2011-01-13 04:17:54 EST 
3.6.2 RC1 was yesterday so to submit the fix I will need a component lead and an additional committer vote. Luckily, Szymon is both ;) Szymon, please review.
Comment 4 Szymon Brandys CLA 2011-01-17 10:32:33 EST 
The patch looks good.
Comment 5 Tomasz Zarna CLA 2011-01-19 08:13:22 EST 
Created attachment 187100 [details]
Update fix

The same patch with updated copyrights and bundle versions.
Comment 6 Tomasz Zarna CLA 2011-01-19 08:20:34 EST 
The code is now the repository. Tagged for the next M-build. Should be available in M20110119-xxxx.
Comment 7 Tomasz Zarna CLA 2011-01-25 12:08:53 EST 
Duc, please verify the fix if you have a chance.
Comment 8 Duc Luu CLA 2011-01-25 12:20:36 EST 
I have verified that the test fix that provided work correctly for the Team > Merge operation with logical model.

Thank you for investigating and fixing this problem.
Comment 9 Szymon Brandys CLA 2011-02-01 03:43:21 EST 
Tomek, could you verify the fix?
Comment 10 Tomasz Zarna CLA 2011-02-01 03:47:54 EST 
Marking as verified, see comment 8.