Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 336448 - [UI] Switching branch in CDOSessionView does not work
Summary: [UI] Switching branch in CDOSessionView does not work
Status: ASSIGNED
Alias: None
Product: EMF
Classification: Modeling
Component: cdo.ui (show other bugs)
Version: 4.13   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Eike Stepper CLA
QA Contact: Eike Stepper CLA
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 337125
  Show dependency tree
 
Reported: 2011-02-06 07:01 EST by Martin Fluegge CLA
Modified: 2020-12-11 10:42 EST (History)
2 users (show)

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 Martin Fluegge CLA 2011-02-06 07:01:39 EST 
I tried to switch to another branch in the CDOSessionsView using the appropriate dialog. Somehow the switching seems to work because if I want to switch the the new branch again the dialog mentions that it is already select. But If I open a resource it does not show the content of the current, but the previous branch. I switched from HEAD to another branch. I always got the content of the HEAD resource.
Comment 1 Frieder Jacobi CLA 2011-02-07 11:57:39 EST 
I also encountered this bug and "hot"fixed it in org.eclipse.emf.internal.cdo.view.CDOViewImpl.setBranchPoint(CDOBranchPoint branchPoint)

Obviously, the call of getInvalidObjects(timeStamp) results in an empty list, although some (or all) resources should get invalidated.
So I replaced this line:

    List<InternalCDOObject> invalidObjects = getInvalidObjects(timeStamp);

by this one:

    List<InternalCDOObject> invalidObjects = Arrays.asList(getObjectsArray());

- brute force, I know. But for test&play purposes it works (and I did not encounter any negative side effects up to now).
Comment 2 Eike Stepper CLA 2011-02-11 06:39:49 EST 
Committed revision 7064
Comment 3 Eike Stepper CLA 2011-02-12 12:41:38 EST 
Committed revision 7067:
- trunk/plugins/org.eclipse.emf.cdo.common
- trunk/plugins/org.eclipse.emf.cdo.ui
- trunk/plugins/org.eclipse.emf.cdo.ui.ide
- trunk/plugins/org.eclipse.emf.cdo.ui.location
- trunk/plugins/org.eclipse.emf.cdo.ui.shared
- trunk/plugins/org.eclipse.net4j.util.ui
Comment 4 Eike Stepper CLA 2011-02-13 09:24:15 EST 
Committed revision 7068:
- trunk/plugins/org.eclipse.emf.cdo
- trunk/plugins/org.eclipse.emf.cdo.common
- trunk/plugins/org.eclipse.emf.cdo.tests
- trunk/plugins/org.eclipse.emf.cdo.ui
- trunk/plugins/org.eclipse.emf.cdo.ui.efs
- trunk/plugins/org.eclipse.net4j.ui
- trunk/plugins/org.eclipse.net4j.util
- trunk/plugins/org.eclipse.net4j.util.ui
Comment 5 Eike Stepper CLA 2011-02-13 09:26:12 EST 
Vik, do you want to check the new UI elements for branching? Just update your workspace...
Comment 6 Eike Stepper CLA 2011-02-13 13:47:43 EST 
Committed revision 7069:
- trunk/plugins/org.eclipse.emf.cdo.ui
Comment 7 Eike Stepper CLA 2011-02-14 05:15:39 EST 
Committed revision 7072 (test cosmetics)
Comment 8 Eike Stepper CLA 2011-02-14 14:34:57 EST 
Committed revision 7076
Comment 9 Eike Stepper CLA 2012-06-05 07:30:22 EDT 
Moving all open bug reports to 4.1 because the release is very near and it's hghly unlikely that there will be spare time to address 4.0 problems.

Please make sure that your patches can be applied against the master branch and that your problem is not already fixed there!!!
Comment 10 Eike Stepper CLA 2012-08-14 22:51:36 EDT 
Moving all open issues to 4.2. Open bugs can be ported to 4.1 maintenance after they've been fixed in master.
Comment 11 Eike Stepper CLA 2013-06-29 12:17:36 EDT 
We'll try to address open problems in 4.3 (master) first and then port fixes back to 4.2.
Comment 12 Eike Stepper CLA 2015-07-14 02:10:22 EDT 
Moving all open bugzillas to 4.5.
Comment 13 Eike Stepper CLA 2016-07-31 00:53:01 EDT 
Moving all unaddressed bugzillas to 4.6.
Comment 14 Eike Stepper CLA 2017-12-28 01:19:25 EST 
Moving all open bugs to 4.7
Comment 15 Eike Stepper CLA 2019-11-08 02:14:29 EST 
Moving all unresolved issues to version 4.8-
Comment 16 Eike Stepper CLA 2019-12-13 12:47:28 EST 
Moving all unresolved issues to version 4.9
Comment 17 Eike Stepper CLA 2020-12-11 10:42:15 EST 
Moving to 4.13.