Bug 311056

Comment 1 Arno Unkrig 2010-04-29 12:38:20 EDT

Created attachment 166518 [details]
The (minimal) change that is required on revision 1.12 of org.eclipse.team.core/src/org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java

This patch is in CONTEXT DIFF format, and is trivial: A one-line change in line 328.

Comment 2 Arno Unkrig 2010-04-29 12:54:37 EDT

Also it may be worth considering to add a popup menu Entry

  "Compare With / Base revision"

as a shortcut for

  "Compare With / Another Branch or Version... / BASE"

, which is quite hard to find.

(Actually I built a helper plugin which does exactly that, as an interim solution for my company.)

Comment 3 Eclipse Webmaster 2010-04-29 13:35:04 EDT

I'm pretty sure this belongs to the Platform team.  Apologies if that is not the case.

-M.

Comment 4 Arno Unkrig 2010-06-14 03:33:10 EDT

Hello... is there anybody out there? This is a very small, yet useful one!

Comment 5 Arno Unkrig 2011-09-27 11:14:37 EDT

Can YOU help?

Comment 6 Arno Unkrig 2011-09-27 12:13:27 EDT

The patch I provided is wrong. Instead, in "org/eclipse/team/core/variants/ResourceVariantTreeSubscriber.java" the lines

private IStatus refresh(IResource resource, int depth, IProgressMonitor monitor) {
    monitor = Policy.monitorFor(monitor);
    try {
        monitor.beginTask(null, 100);
        Set allChanges = new HashSet();
        if (getResourceComparator().isThreeWay()) {
            IResource[] baseChanges = getBaseTree().refresh(new IResource[] {resource}, depth, Policy.subMonitorFor(monitor, 25));
            allChanges.addAll(Arrays.asList(baseChanges));
        }
        IResource[] remoteChanges = getRemoteTree().refresh(new IResource[] {resource}, depth, Policy.subMonitorFor(monitor, 75));
        allChanges.addAll(Arrays.asList(remoteChanges));
        IResource[] changedResources = (IResource[]) allChanges.toArray(new IResource[allChanges.size()]);
        fireTeamResourceChange(SubscriberChangeEvent.asSyncChangedDeltas(this, changedResources));
        return Status.OK_STATUS;
        ...

should be changed to something like

        ...
        if (getTag() != CVSTag.BASE) {
            IResource[] remoteChanges = getRemoteTree().refresh(new IResource[] {resource}, depth, Policy.subMonitorFor(monitor, 75));
            allChanges.addAll(Arrays.asList(remoteChanges));
        }

Comment 7 Arno Unkrig 2011-10-07 08:35:55 EDT

Who's going to take this one from the CVS inbox?

Comment 8 Tomasz Zarna 2011-10-11 08:17:54 EDT

Krzysztof, could you take a look at Arno's patch? Compare with Base is your baby ;) 

Arno, please update the patch with comment 6 in the meantime.

Comment 9 Arno Unkrig 2011-10-27 08:44:35 EDT

Created attachment 206069 [details]
The one-liner that fixes the problem

I added the patch that fixes the problem... however I am not absolutely sure that it is correct - code review required!

Comment 10 Eclipse Genie 2021-12-01 19:26:08 EST

This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet. As such, we're closing this bug.

If you have further information on the current state of the bug, please add it and reopen this bug. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant.

--
The automated Eclipse Genie.