Bug 21817 - Enhancements to three way comparison of external files and folders
Summary: Enhancements to three way comparison of external files and folders
Status: NEW
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Compare (show other bugs)
Version: 2.0   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Platform-Compare-Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
: 5034 7147 7419 29945 30051 30355 31196 458746 (view as bug list)
Depends on:
Blocks:
 
Reported: 2002-07-23 12:04 EDT by Missing name CLA
Modified: 2015-01-30 04:38 EST (History)
10 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Missing name CLA 2002-07-23 12:04:37 EDT
The "Compare With" menu item on the menu that is activated when you right click 
on a file in the Package Explorer does not have the capability to compare with 
a file outside of the workspace. It would be beneficial to have this capability 
because then you wouldn't have to import the non-workspace file into the 
workspace just to do a compare. The same can be said for "folders" and non-
workspace directories on the filesystem.
Comment 1 Andre Weinand CLA 2003-01-20 06:39:00 EST
future
Comment 2 Andre Weinand CLA 2003-01-27 09:17:43 EST
*** Bug 30051 has been marked as a duplicate of this bug. ***
Comment 3 Andre Weinand CLA 2003-01-27 09:18:27 EST
*** Bug 29945 has been marked as a duplicate of this bug. ***
Comment 4 Andre Weinand CLA 2003-01-28 10:04:34 EST
*** Bug 30355 has been marked as a duplicate of this bug. ***
Comment 5 Andre Weinand CLA 2003-02-10 08:44:05 EST
*** Bug 31196 has been marked as a duplicate of this bug. ***
Comment 6 Gunnar Wagenknecht CLA 2003-02-10 09:31:56 EST
Bug 31196 has been marked as a duplicat but I'm not sure if this really fits.

In bug 31196 I wanted to point out, that an asynchron compare is not possible. 
The current "Compare With -> Each Other" only shows differences in the folder 
structure but it is not possible to add or remove complete folders. 

It is also not possible to deside, which is the target folder and which is the 
source. If this can be defined an asynchron compare can be performed (delete 
files and folders in the target folder that don't exists in the source folder 
and copy new files and folders from the source into the target).
Comment 7 Andre Weinand CLA 2003-02-10 11:44:12 EST
I believe I understand your points (even if the term "asynchron compare" is new to me).

So let me recap what you need (and what compare already provides):

- three-way compare: without it you cannot know whether a change is a deletion,
  or an addition. You need a common ancestor against which you can compare your
  workspace folder and your external folder. Just knowing what is the source and what
  is the target doesn't help because you cannot distinguish a deletion from an addition.
  The compare plugin already supports three-way compare, however you cannot specify
  the "meaning" of the three inputs (e.g. what is the ancestor, local, and remote).

- the inputs of the compare can be external, that is they need not live within the
  workspace. Eclipse supports this somewhat with "linked" folders.

- you need actions to copy or delete a folder from one side of the compare to the other.
  The compare plugin already supports deletions and creations of single files, but not of
  whole folders.
Comment 8 Andre Weinand CLA 2003-02-10 11:53:19 EST
*** Bug 7147 has been marked as a duplicate of this bug. ***
Comment 9 Andre Weinand CLA 2003-02-10 11:54:14 EST
*** Bug 7419 has been marked as a duplicate of this bug. ***
Comment 10 Andre Weinand CLA 2003-02-10 11:55:10 EST
*** Bug 5034 has been marked as a duplicate of this bug. ***
Comment 11 Gunnar Wagenknecht CLA 2003-02-10 12:31:28 EST
Exactly except point one.

"Asynchronous compare" is a phrase I borrowed from Total Commander 
(http://www.ghisler.com/index.htm). It doesn't really need a three way compare.

You have the base folder (left) and want a target folder (right) to contain 
exactly the same files and folders like the base. Thus, a compare is done to 
look wich files and folder exist in the base and don't exist in the target, 
they get marked as "copy from left to right". Folders and Files that don't 
exist in the left side but do exist in the right side are marked as "delete on 
the right side". Files that exist left and right are compared using there 
timestamp or content (is selectable). If they are different and the file on the 
right side is older then the file on the left side, the file is marked 
as "replace right side with file from left side". If the file on the right side 
is newer, than a conflict is shown.

In general "asynchronous compare/merge" means that you want the folder on the 
right side sontain the same files and folders like the folder on the left side 
and not more.

The reason I can't do this with the application mentioned above is that the 
application doesn't have a "VCM" feature. Eclipse has a "VCM" feature and is 
capable of auto-checkout files and folders on the 'right' side if necessary :).

As you see, a 3-way compare is ok. The "asynchronouse compare" might be a 
special case of the 3-way compare where the base == the source folder.
Comment 12 Tomasz Zarna CLA 2008-05-12 04:15:47 EDT
The original report from comment 0 looks pretty much like bug 73923. However, the discussion among Andre and Gunnar seems to be more about enhancements for three-way comparison of folders than comparing files outside of the workspace (as originally reported). Updating the summary to better match the reality then.
Comment 13 Tomasz Zarna CLA 2008-05-12 04:22:16 EDT
Let me take it off your plate Erich, I hope you don't mind. Reassigning to Compare inbox.
Comment 14 Dani Megert CLA 2015-01-30 04:38:27 EST
*** Bug 458746 has been marked as a duplicate of this bug. ***